Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 615aaa5f authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7d708ee4

drivers/gpu/drm/i915/intel_pm.c

+4 −0
Original line number Diff line number Diff line
@@ -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) {