From: Ville Syrjälä Date: Wed, 24 Apr 2013 18:09:10 +0000 (+0300) Subject: drm/i915: Re-enable FBC WM if the watermark is good on gen6+ X-Git-Tag: v3.11-rc1~65^2~131^2~31 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=615aaa5f96e40971039e01105c09808a3dead7d5;p=~emulex%2Finfiniband.git drm/i915: Re-enable FBC WM if the watermark is good on gen6+ If the calculated FBC watermark is no good, we simply disable FBC watermarks. But we fail to re-enable them later if the calculated watermark becomes good again. Fix that, but remember to leave FBC watermarks disabled on ILK since that's required by some workarounds. v2: Fix checkpatch complaint Signed-off-by: Ville Syrjälä Reviewed-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 22e3af68b13..7d35f430115 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -1631,6 +1631,10 @@ static bool ironlake_check_srwm(struct drm_device *dev, int level, I915_WRITE(DISP_ARB_CTL, I915_READ(DISP_ARB_CTL) | DISP_FBC_WM_DIS); return false; + } else if (INTEL_INFO(dev)->gen >= 6) { + /* enable FBC WM (except on ILK, where it must remain off) */ + I915_WRITE(DISP_ARB_CTL, + I915_READ(DISP_ARB_CTL) & ~DISP_FBC_WM_DIS); } if (display_wm > display->max_wm) {