From: Eugeni Dodonov Date: Wed, 9 May 2012 18:37:11 +0000 (-0300) Subject: drm/i915: calculate watermarks for devices that have 3 pipes X-Git-Tag: v3.5-rc1~100^2~25^2~32 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=461bc9b587389586edf9315b337fb136f33594ad;p=~emulex%2Finfiniband.git drm/i915: calculate watermarks for devices that have 3 pipes This adds proper support for calculating those watermarks, checking for number of available pipes instead of specific GPU variants when deciding if watermarks for 3rd pipe are necessary. Reviewed-by: Jesse Barnes Signed-off-by: Eugeni Dodonov Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 43892341079..21587f89f44 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/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,