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

mikuint · danvet · commit 992f191f2c83 · 2014-05-16T16:28:56.000+02:00
Bit 31 in GEN6_PMINTRMSK is not an interrupt disable bit with gen8.

Reviewed-by: Ville Syrjälä &lt;ville.syrjala@linux.intel.com&gt;
Signed-off-by: Mika Kuoppala &lt;mika.kuoppala@intel.com&gt;
Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt;
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -3253,7 +3253,7 @@ static void gen8_disable_rps_interrupts(struct drm_device *dev)`
`3253`	`3253`	`{`
`3254`	`3254`	`struct drm_i915_private *dev_priv = dev->dev_private;`
`3255`	`3255`
`3256`		`- I915_WRITE(GEN6_PMINTRMSK, 0xffffffff);`
	`3256`	`+ I915_WRITE(GEN6_PMINTRMSK, ~GEN8_PMINTR_REDIRECT_TO_NON_DISP);`
`3257`	`3257`	`I915_WRITE(GEN8_GT_IER(2), I915_READ(GEN8_GT_IER(2)) &`
`3258`	`3258`	`~dev_priv->pm_rps_events);`
`3259`	`3259`	`/* Complete PM interrupt masking here doesn't race with the rps work`