summaryrefslogtreecommitdiffstats
path: root/sys/dev/pci/drm/i915
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2020-06-26 05:28:50 +0000
committerjsg <jsg@openbsd.org>2020-06-26 05:28:50 +0000
commit29a488422c5624135621e19bc78ed99cc383e02b (patch)
tree7cbccb303a1560884e542e1d6ae27a99c2d6dc2e /sys/dev/pci/drm/i915
parenthandle EINTR in waitfd() and timeout_connect() helpers; (diff)
downloadwireguard-openbsd-29a488422c5624135621e19bc78ed99cc383e02b.tar.xz
wireguard-openbsd-29a488422c5624135621e19bc78ed99cc383e02b.zip
drm/i915/icl+: Fix hotplug interrupt disabling after storm detection
From Imre Deak 2e61678ba2383c0d10a7c862721150a37ffe4eee in linux 5.7.y/5.7.6 a3005c2edf7e8c3478880db1ca84028a2b6819bb in mainline linux
Diffstat (limited to 'sys/dev/pci/drm/i915')
-rw-r--r--sys/dev/pci/drm/i915/i915_irq.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/dev/pci/drm/i915/i915_irq.c b/sys/dev/pci/drm/i915/i915_irq.c
index 22692300972..081c5baf281 100644
--- a/sys/dev/pci/drm/i915/i915_irq.c
+++ b/sys/dev/pci/drm/i915/i915_irq.c
@@ -3092,6 +3092,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);