diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2023-02-23 12:27:32 +0300 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2023-02-23 12:27:32 +0300 |
| commit | 27121864ab366992583d894961ecdc6e2ffe0ca1 (patch) | |
| tree | 87ef1dcf82ce2d0d29b686d5ae81003ab3eb3b4a /drivers/gpu/drm/i915/i915_irq.c | |
| parent | 84549c816dc317f012798e706e58669b3b013604 (diff) | |
| parent | f047382519ca41702ebaee5a862e87390f687137 (diff) | |
| download | linux-27121864ab366992583d894961ecdc6e2ffe0ca1.tar.xz | |
Merge tag 'spi-nor/for-6.3' into mtd/next
SPI NOR changes:
* small fixes on core and spansion driver.
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index edfe363af838..91c533986041 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1974,7 +1974,10 @@ static void icp_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir) if (ddi_hotplug_trigger) { u32 dig_hotplug_reg; + /* Locking due to DSI native GPIO sequences */ + spin_lock(&dev_priv->irq_lock); dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore, SHOTPLUG_CTL_DDI, 0, 0); + spin_unlock(&dev_priv->irq_lock); intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask, ddi_hotplug_trigger, dig_hotplug_reg, |