aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_irq.c
diff options
context:
space:
mode:
authorImre Deak <imre.deak@intel.com>2014-04-14 13:24:23 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-05-05 03:08:51 -0400
commit843d0e7d3262ac8f68c3ee22ec41535ab1de833a (patch)
treec6241cb880d6f05ee613bdfc0cade19242865e3f /drivers/gpu/drm/i915/i915_irq.c
parent981a5aead1fcfe3ef4de3ae86b1469b99032b287 (diff)
drm/i915: vlv: clear master interrupt flag when disabling interrupts
Not clearing this flag causes spurious interrupts at least in D3 state, so before enabling RPM we need to fix this. We were already setting this flag when enabling interrupts, only clearing it was missing. Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 2b3d852acb04..274c108dcb47 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -3318,6 +3318,8 @@ static void valleyview_irq_uninstall(struct drm_device *dev)
3318 if (!dev_priv) 3318 if (!dev_priv)
3319 return; 3319 return;
3320 3320
3321 I915_WRITE(VLV_MASTER_IER, 0);
3322
3321 intel_hpd_irq_uninstall(dev_priv); 3323 intel_hpd_irq_uninstall(dev_priv);
3322 3324
3323 for_each_pipe(pipe) 3325 for_each_pipe(pipe)