aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2014-03-17 13:59:48 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-03-18 11:31:38 -0400
commit83f26f16970cd4738585e642a6d90b063f1cebdb (patch)
tree1583ec55cc145bed3c1672ce1f03aafa2a3607c7 /drivers/gpu
parent24f3e092b8e2939365e2105c2eed3e3db2813aa6 (diff)
drm/i915: Remove spurious '()' in WARN macros
No need of any here. Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8c3746f7b523..ffb0b632b779 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1166,7 +1166,7 @@ static void assert_planes_disabled(struct drm_i915_private *dev_priv,
1166 if (INTEL_INFO(dev)->gen >= 4) { 1166 if (INTEL_INFO(dev)->gen >= 4) {
1167 reg = DSPCNTR(pipe); 1167 reg = DSPCNTR(pipe);
1168 val = I915_READ(reg); 1168 val = I915_READ(reg);
1169 WARN((val & DISPLAY_PLANE_ENABLE), 1169 WARN(val & DISPLAY_PLANE_ENABLE,
1170 "plane %c assertion failure, should be disabled but not\n", 1170 "plane %c assertion failure, should be disabled but not\n",
1171 plane_name(pipe)); 1171 plane_name(pipe));
1172 return; 1172 return;
@@ -1195,20 +1195,20 @@ static void assert_sprites_disabled(struct drm_i915_private *dev_priv,
1195 for_each_sprite(pipe, sprite) { 1195 for_each_sprite(pipe, sprite) {
1196 reg = SPCNTR(pipe, sprite); 1196 reg = SPCNTR(pipe, sprite);
1197 val = I915_READ(reg); 1197 val = I915_READ(reg);
1198 WARN((val & SP_ENABLE), 1198 WARN(val & SP_ENABLE,
1199 "sprite %c assertion failure, should be off on pipe %c but is still active\n", 1199 "sprite %c assertion failure, should be off on pipe %c but is still active\n",
1200 sprite_name(pipe, sprite), pipe_name(pipe)); 1200 sprite_name(pipe, sprite), pipe_name(pipe));
1201 } 1201 }
1202 } else if (INTEL_INFO(dev)->gen >= 7) { 1202 } else if (INTEL_INFO(dev)->gen >= 7) {
1203 reg = SPRCTL(pipe); 1203 reg = SPRCTL(pipe);
1204 val = I915_READ(reg); 1204 val = I915_READ(reg);
1205 WARN((val & SPRITE_ENABLE), 1205 WARN(val & SPRITE_ENABLE,
1206 "sprite %c assertion failure, should be off on pipe %c but is still active\n", 1206 "sprite %c assertion failure, should be off on pipe %c but is still active\n",
1207 plane_name(pipe), pipe_name(pipe)); 1207 plane_name(pipe), pipe_name(pipe));
1208 } else if (INTEL_INFO(dev)->gen >= 5) { 1208 } else if (INTEL_INFO(dev)->gen >= 5) {
1209 reg = DVSCNTR(pipe); 1209 reg = DVSCNTR(pipe);
1210 val = I915_READ(reg); 1210 val = I915_READ(reg);
1211 WARN((val & DVS_ENABLE), 1211 WARN(val & DVS_ENABLE,
1212 "sprite %c assertion failure, should be off on pipe %c but is still active\n", 1212 "sprite %c assertion failure, should be off on pipe %c but is still active\n",
1213 plane_name(pipe), pipe_name(pipe)); 1213 plane_name(pipe), pipe_name(pipe));
1214 } 1214 }