diff options
| author |   Imre Deak <imre.deak@intel.com> | 2020-06-12 15:17:31 +0300 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2020-06-15 09:46:38 +0300 |
| commit | 587a87b9d7e94927edcdea018565bc1939381eb1 (patch) | |
| tree | 14cd43487750dc4743adc63c4da14ebc84db26e6 /drivers/gpu/drm/i915/i915_irq.c | |
| parent | drm/i915/gt: Flush gen3 relocs harder, again (diff) | |
| download | linux-dev-587a87b9d7e94927edcdea018565bc1939381eb1.tar.xz linux-dev-587a87b9d7e94927edcdea018565bc1939381eb1.zip | |
drm/i915/icl+: Fix hotplug interrupt disabling after storm detection
Atm, hotplug interrupts on TypeC ports are left enabled after detecting
an interrupt storm, fix this.
Reported-by: Kunal Joshi <kunal1.joshi@intel.com>
References: https://gitlab.freedesktop.org/drm/intel/-/issues/351
Bugzilla: https://gitlab.freedesktop.org/drm/intel/-/issues/1964
Cc: Kunal Joshi <kunal1.joshi@intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200612121731.19596-1-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 8e823ba25f5f..710224d930c5 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -3132,6 +3132,7 @@ static void gen11_hpd_irq_setup(struct drm_i915_private *dev_priv) val = I915_READ(GEN11_DE_HPD_IMR); val &= ~hotplug_irqs; + val |= ~enabled_irqs & hotplug_irqs; I915_WRITE(GEN11_DE_HPD_IMR, val); POSTING_READ(GEN11_DE_HPD_IMR); |