From 8bf7526886f532597726a8e9e1ecf6bb5a5cb1c1 Mon Sep 17 00:00:00 2001 From: Eugeni Dodonov Date: Wed, 9 May 2012 15:37:11 -0300 Subject: [PATCH] --- yaml --- r: 307431 b: refs/heads/master c: 461bc9b587389586edf9315b337fb136f33594ad h: refs/heads/master i: 307429: b8c280b14816d0cf6a33d14f35d54642d0868c01 307427: cd0f208e0c0060d21afcdd8b3927cde0e2b63c3a 307423: 8fe08b96cf2458f6766e107ad523c5537d7426ca v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_pm.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ac7d0aa0e707..a065dd857346 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a416edefbbaf942b588595ad6fa63ac700f5d73c +refs/heads/master: 461bc9b587389586edf9315b337fb136f33594ad diff --git a/trunk/drivers/gpu/drm/i915/intel_pm.c b/trunk/drivers/gpu/drm/i915/intel_pm.c index 43892341079a..21587f89f44b 100644 --- a/trunk/drivers/gpu/drm/i915/intel_pm.c +++ b/trunk/drivers/gpu/drm/i915/intel_pm.c @@ -1803,8 +1803,7 @@ static void sandybridge_update_wm(struct drm_device *dev) enabled |= 2; } - /* IVB has 3 pipes */ - if (IS_IVYBRIDGE(dev) && + if ((dev_priv->num_pipe == 3) && g4x_compute_wm0(dev, 2, &sandybridge_display_wm_info, latency, &sandybridge_cursor_wm_info, latency,