From: Chris Wilson Date: Mon, 31 Jan 2011 10:29:55 +0000 (+0000) Subject: drm/i915: Remove unreachable condition X-Git-Tag: v2.6.39-rc1~458^2~9^2~36 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=72557b4f326ac2f7d469ae5a35fab57e13d9a602;p=~emulex%2Finfiniband.git drm/i915: Remove unreachable condition Fortunately unreachable. For Crestline, the watermarks must always be programmed to 8... Signed-off-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f4ba9d83ab4..7e1ecc8e35a 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;