drm/i915: Remove unreachable condition
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 31 Jan 2011 10:29:55 +0000 (10:29 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 1 Feb 2011 08:48:37 +0000 (08:48 +0000)
Fortunately unreachable. For Crestline, the watermarks must always be
programmed to 8...

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/intel_display.c

index f4ba9d8..7e1ecc8 100644 (file)
@@ -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;