From: Adam Jackson Date: Wed, 20 Feb 2013 16:54:17 +0000 (-0500) Subject: drm/i915: Fix up mismerge of 3490ea5d in 3.7.y X-Git-Tag: v3.7.10~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=732b2a1a4bb58677ba9c7be3fac0960ceccc9b8f;p=thirdparty%2Fkernel%2Fstable.git drm/i915: Fix up mismerge of 3490ea5d in 3.7.y The 3.7.y version of this seems to have missed a hunk in i9xx_update_wm. Tested-by: Glen Gray Signed-off-by: Adam Jackson Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 4e6a2b226278f..313088ff3318b 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -1474,7 +1474,7 @@ static void i9xx_update_wm(struct drm_device *dev) fifo_size = dev_priv->display.get_fifo_size(dev, 0); crtc = intel_get_crtc_for_plane(dev, 0); - if (crtc->enabled && crtc->fb) { + if (intel_crtc_active(crtc)) { planea_wm = intel_calculate_wm(crtc->mode.clock, wm_info, fifo_size, crtc->fb->bits_per_pixel / 8,