diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2025-05-06 16:06:44 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2025-05-07 11:03:14 +0300 |
| commit | 5d22f72026f68e7773780b4fa1f4907f56b6abc8 (patch) | |
| tree | 6381e51825341e87afb06d764382f2ea6ee734a9 /drivers/gpu/drm/i915/display/intel_display_irq.c | |
| parent | ed6da23b664ddc9e2d12114670260b6986088154 (diff) | |
| download | linux-5d22f72026f68e7773780b4fa1f4907f56b6abc8.tar.xz | |
drm/i915/irq: move locking inside valleyview_{enable, disable}_display_irqs()
All users of valleyview_enable_display_irqs() and
valleyview_disable_display_irqs() have a lock/unlock pair. Move the
locking inside the functions.
Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/bb6d941c47260aea11e4af5d52572b0e5f139929.1746536745.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_display_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display_irq.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c index 22bb0fc10736..3d2294a4d83d 100644 --- a/drivers/gpu/drm/i915/display/intel_display_irq.c +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c @@ -2117,10 +2117,10 @@ void valleyview_enable_display_irqs(struct intel_display *display) { struct drm_i915_private *dev_priv = to_i915(display->drm); - lockdep_assert_held(&dev_priv->irq_lock); + spin_lock_irq(&dev_priv->irq_lock); if (display->irq.vlv_display_irqs_enabled) - return; + goto out; display->irq.vlv_display_irqs_enabled = true; @@ -2128,21 +2128,26 @@ void valleyview_enable_display_irqs(struct intel_display *display) _vlv_display_irq_reset(display); vlv_display_irq_postinstall(display); } + +out: + spin_unlock_irq(&dev_priv->irq_lock); } void valleyview_disable_display_irqs(struct intel_display *display) { struct drm_i915_private *dev_priv = to_i915(display->drm); - lockdep_assert_held(&dev_priv->irq_lock); + spin_lock_irq(&dev_priv->irq_lock); if (!display->irq.vlv_display_irqs_enabled) - return; + goto out; display->irq.vlv_display_irqs_enabled = false; if (intel_irqs_enabled(dev_priv)) _vlv_display_irq_reset(display); +out: + spin_unlock_irq(&dev_priv->irq_lock); } void ilk_de_irq_postinstall(struct intel_display *display) |