summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-01-31 10:29:55 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2011-02-01 08:48:37 +0000
commit72557b4f326ac2f7d469ae5a35fab57e13d9a602 (patch)
treeb178724266db2d6e3f079acdb1cc011887b313f9 /drivers/gpu/drm/i915/intel_display.c
parent5a1e5b6c460dccfd189c7e962281c8cce75da728 (diff)
downloadtalos-op-linux-72557b4f326ac2f7d469ae5a35fab57e13d9a602.tar.gz
talos-op-linux-72557b4f326ac2f7d469ae5a35fab57e13d9a602.zip
drm/i915: Remove unreachable condition
Fortunately unreachable. For Crestline, the watermarks must always be programmed to 8... 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 f4ba9d83ab4e..7e1ecc8e35ac 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3899,8 +3899,7 @@ static void i9xx_update_wm(struct drm_device *dev)
int planea_wm, planeb_wm;
struct drm_crtc *crtc, *enabled = NULL;
- /* Create copies of the base settings for each pipe */
- if (IS_CRESTLINE(dev) || IS_I945GM(dev))
+ if (IS_I945GM(dev))
wm_info = &i945_wm_info;
else if (!IS_GEN2(dev))
wm_info = &i915_wm_info;
OpenPOWER on IntegriCloud