From: Imre Deak Date: Mon, 14 Apr 2014 17:24:23 +0000 (+0300) Subject: drm/i915: vlv: clear master interrupt flag when disabling interrupts X-Git-Tag: next-20140428~44^2~25 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dc1f3226796af5eee7264fe12ce7060b2fbdd34b;p=karo-tx-linux.git 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 Reviewed-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 63bd5de12ff6..aa62a41b21f1 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -3308,6 +3308,8 @@ static void valleyview_irq_uninstall(struct drm_device *dev) if (!dev_priv) return; + I915_WRITE(VLV_MASTER_IER, 0); + intel_hpd_irq_uninstall(dev_priv); for_each_pipe(pipe)