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

jnikula · jnikula · commit ed6da23b664d · 2025-05-07T11:03:14.000+03:00
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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -1884,8 +1884,12 @@ static void _vlv_display_irq_reset(struct intel_display *display)`
`1884`	`1884`
`1885`	`1885`	`void vlv_display_irq_reset(struct intel_display *display)`
`1886`	`1886`	`{`
	`1887`	`+ struct drm_i915_private *dev_priv = to_i915(display->drm);`
	`1888`	`+`
	`1889`	`+ spin_lock_irq(&dev_priv->irq_lock);`
`1887`	`1890`	`if (display->irq.vlv_display_irqs_enabled)`
`1888`	`1891`	`_vlv_display_irq_reset(display);`
	`1892`	`+ spin_unlock_irq(&dev_priv->irq_lock);`
`1889`	`1893`	`}`
`1890`	`1894`
`1891`	`1895`	`void i9xx_display_irq_reset(struct intel_display *display)`
Original file line number	Diff line number	Diff line change
`@@ -688,9 +688,7 @@ static void valleyview_irq_reset(struct drm_i915_private *dev_priv)`
`688`	`688`
`689`	`689`	`gen5_gt_irq_reset(to_gt(dev_priv));`
`690`	`690`
`691`		`- spin_lock_irq(&dev_priv->irq_lock);`
`692`	`691`	`vlv_display_irq_reset(display);`
`693`		`- spin_unlock_irq(&dev_priv->irq_lock);`
`694`	`692`	`}`
`695`	`693`
`696`	`694`	`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)`
`752`	`750`
`753`	`751`	`gen2_irq_reset(uncore, GEN8_PCU_IRQ_REGS);`
`754`	`752`
`755`		`- spin_lock_irq(&dev_priv->irq_lock);`
`756`	`753`	`vlv_display_irq_reset(display);`
`757`		`- spin_unlock_irq(&dev_priv->irq_lock);`
`758`	`754`	`}`
`759`	`755`
`760`	`756`	`static void ilk_irq_postinstall(struct drm_i915_private *dev_priv)`