aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-01-24 11:35:42 -0500
committerChris Wilson <chris@chris-wilson.co.uk>2011-01-25 05:33:11 -0500
commit29ee399131395d8b607803874a206b9daf714025 (patch)
tree07f45f1652eed04640d7f954f765dbe33f9971fd /drivers/gpu/drm/i915/intel_display.c
parentbdd92c9ad287e03a2ec52f5a89c470cd5caae1c2 (diff)
drm/i915: Silence a few -Wunused-but-set-variable
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 36958fdabdce..2fbc3da06c29 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4346,7 +4346,7 @@ static void intel_update_watermarks(struct drm_device *dev)
4346 struct drm_i915_private *dev_priv = dev->dev_private; 4346 struct drm_i915_private *dev_priv = dev->dev_private;
4347 struct drm_crtc *crtc; 4347 struct drm_crtc *crtc;
4348 int sr_hdisplay = 0; 4348 int sr_hdisplay = 0;
4349 unsigned long planea_clock = 0, planeb_clock = 0, sr_clock = 0; 4349 unsigned long planea_clock = 0, planeb_clock = 0;
4350 int enabled = 0, pixel_size = 0; 4350 int enabled = 0, pixel_size = 0;
4351 int sr_htotal = 0; 4351 int sr_htotal = 0;
4352 4352
@@ -4368,7 +4368,6 @@ static void intel_update_watermarks(struct drm_device *dev)
4368 planeb_clock = crtc->mode.clock; 4368 planeb_clock = crtc->mode.clock;
4369 } 4369 }
4370 sr_hdisplay = crtc->mode.hdisplay; 4370 sr_hdisplay = crtc->mode.hdisplay;
4371 sr_clock = crtc->mode.clock;
4372 sr_htotal = crtc->mode.htotal; 4371 sr_htotal = crtc->mode.htotal;
4373 if (crtc->fb) 4372 if (crtc->fb)
4374 pixel_size = crtc->fb->bits_per_pixel / 8; 4373 pixel_size = crtc->fb->bits_per_pixel / 8;