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

Commit 992f191f authored by Mika Kuoppala's avatar Mika Kuoppala Committed by Daniel Vetter
Browse files

drm/i915: Be careful with non-disp bit in PMINTRMSK 



Bit 31 in GEN6_PMINTRMSK is not an interrupt disable bit with gen8.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 19656430

drivers/gpu/drm/i915/intel_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -3253,7 +3253,7 @@ static void gen8_disable_rps_interrupts(struct drm_device *dev) 
{

	struct drm_i915_private *dev_priv = dev->dev_private;



	I915_WRITE(GEN6_PMINTRMSK, 0xffffffff);

	I915_WRITE(GEN6_PMINTRMSK, ~GEN8_PMINTR_REDIRECT_TO_NON_DISP);

	I915_WRITE(GEN8_GT_IER(2), I915_READ(GEN8_GT_IER(2)) &

				   ~dev_priv->pm_rps_events);

	/* Complete PM interrupt masking here doesn't race with the rps work