[PATCH 1/8] drm/i915/irq: move locking inside vlv_display_irq_reset()

[Gustavo Sousa]

Quoting Jani Nikula (2025-05-06 10:06:43-03:00)
>All users of vlv_display_irq_reset() have a lock/unlock pair. Move the
>locking inside the function.
>
>Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Reviewed-by: Gustavo Sousa <gustavo.sousa at intel.com>

>---
> drivers/gpu/drm/i915/display/intel_display_irq.c | 4 ++++
> drivers/gpu/drm/i915/i915_irq.c                  | 4 ----
> 2 files changed, 4 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 73b6254c5485..22bb0fc10736 100644
>--- 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 d06694d6531e..b918b440cbce 100644
>--- 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)
>-- 
>2.39.5
>