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

Commit 2adb6db8 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Use RMW to update chicken bits in gen7_enable_fbc() 



gen7_enable_fbc() may write to some registers which we've already
touched, so use RMW so that we don't undo any previous updates.

Also note that we implemnt WaFbcAsynchFlipDisableFbcQueue:bdw.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c7c65622

drivers/gpu/drm/i915/intel_pm.c

+5 −2
Original line number Diff line number Diff line
@@ -294,10 +294,13 @@ static void gen7_enable_fbc(struct drm_crtc *crtc) 


	if (IS_IVYBRIDGE(dev)) {

		/* WaFbcAsynchFlipDisableFbcQueue:ivb */

		I915_WRITE(ILK_DISPLAY_CHICKEN1, ILK_FBCQ_DIS);

		I915_WRITE(ILK_DISPLAY_CHICKEN1,

			   I915_READ(ILK_DISPLAY_CHICKEN1) |

			   ILK_FBCQ_DIS);

	} else {

		/* WaFbcAsynchFlipDisableFbcQueue:hsw */

		/* WaFbcAsynchFlipDisableFbcQueue:hsw,bdw */

		I915_WRITE(HSW_PIPE_SLICE_CHICKEN_1(intel_crtc->pipe),

			   I915_READ(HSW_PIPE_SLICE_CHICKEN_1(intel_crtc->pipe)) |

			   HSW_BYPASS_FBC_QUEUE);

	}