drm/i915/irq: move locking inside vlv_display_irq_reset()

All users of vlv_display_irq_reset() have a lock/unlock pair. Move the
locking inside the function.

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/0f8176b777fa24921458996f7d6f982f955a52f6.1746536745.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
index 73b6254c5485b1977bc7959794501cca6e4fcb2f..22bb0fc10736eb46919fc0a63389ef24fe587085 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
@@ -1884,8 +1884,12 @@ static void _vlv_display_irq_reset(struct intel_display *display)
 
 void vlv_display_irq_reset(struct intel_display *display)
 {
+       struct drm_i915_private *dev_priv = to_i915(display->drm);
+
+       spin_lock_irq(&dev_priv->irq_lock);
        if (display->irq.vlv_display_irqs_enabled)
                _vlv_display_irq_reset(display);
+       spin_unlock_irq(&dev_priv->irq_lock);
 }
 
 void i9xx_display_irq_reset(struct intel_display *display)

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index d06694d6531e7bdef2fc61c981d61edb6e8000ad..b918b440cbcecc1b8354ce21b4187f1b7361822c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -688,9 +688,7 @@ static void valleyview_irq_reset(struct drm_i915_private *dev_priv)
 
        gen5_gt_irq_reset(to_gt(dev_priv));
 
-       spin_lock_irq(&dev_priv->irq_lock);
        vlv_display_irq_reset(display);
-       spin_unlock_irq(&dev_priv->irq_lock);
 }
 
 static void gen8_irq_reset(struct drm_i915_private *dev_priv)
@@ -752,9 +750,7 @@ static void cherryview_irq_reset(struct drm_i915_private *dev_priv)
 
        gen2_irq_reset(uncore, GEN8_PCU_IRQ_REGS);
 
-       spin_lock_irq(&dev_priv->irq_lock);
        vlv_display_irq_reset(display);
-       spin_unlock_irq(&dev_priv->irq_lock);
 }
 
 static void ilk_irq_postinstall(struct drm_i915_private *dev_priv)