Commit 0f9dd43f authored by Jani Nikula's avatar Jani Nikula
Browse files

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



All users of vlv_display_irq_postinstall() outside of
intel_display_irq.c have a lock/unlock pair. Move the locking inside the
function. Add an unlocked variant for internal use, similar to the
_vlv_display_irq_reset() and vlv_display_irq_reset() functions.

Reviewed-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/93ea785d2d9bdb4e18328aa42a00a492d9d783c0.1746536745.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 5d22f720

drivers/gpu/drm/i915/display/intel_display_irq.c

+12 −5
Original line number Diff line number Diff line
@@ -1908,16 +1908,13 @@ static u32 vlv_error_mask(void) 
	return VLV_ERROR_PAGE_TABLE;

}



void vlv_display_irq_postinstall(struct intel_display *display)

static void _vlv_display_irq_postinstall(struct intel_display *display)

{

	struct drm_i915_private *dev_priv = to_i915(display->drm);

	u32 pipestat_mask;

	u32 enable_mask;

	enum pipe pipe;



	if (!display->irq.vlv_display_irqs_enabled)

		return;



	if (display->platform.cherryview)

		intel_de_write(display, DPINVGTT,

			       DPINVGTT_STATUS_MASK_CHV |
@@ -1954,6 +1951,16 @@ void vlv_display_irq_postinstall(struct intel_display *display) 
	intel_display_irq_regs_init(display, VLV_IRQ_REGS, dev_priv->irq_mask, enable_mask);

}



void vlv_display_irq_postinstall(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_postinstall(display);

	spin_unlock_irq(&dev_priv->irq_lock);

}



void ibx_display_irq_reset(struct intel_display *display)

{

	struct drm_i915_private *i915 = to_i915(display->drm);
@@ -2126,7 +2133,7 @@ void valleyview_enable_display_irqs(struct intel_display *display) 


	if (intel_irqs_enabled(dev_priv)) {

		_vlv_display_irq_reset(display);

		vlv_display_irq_postinstall(display);

		_vlv_display_irq_postinstall(display);

	}



out:

drivers/gpu/drm/i915/i915_irq.c

+0 −4
Original line number Diff line number Diff line
@@ -768,9 +768,7 @@ static void valleyview_irq_postinstall(struct drm_i915_private *dev_priv) 


	gen5_gt_irq_postinstall(to_gt(dev_priv));



	spin_lock_irq(&dev_priv->irq_lock);

	vlv_display_irq_postinstall(display);

	spin_unlock_irq(&dev_priv->irq_lock);



	intel_uncore_write(&dev_priv->uncore, VLV_MASTER_IER, MASTER_INTERRUPT_ENABLE);

	intel_uncore_posting_read(&dev_priv->uncore, VLV_MASTER_IER);
@@ -827,9 +825,7 @@ static void cherryview_irq_postinstall(struct drm_i915_private *dev_priv) 


	gen8_gt_irq_postinstall(to_gt(dev_priv));



	spin_lock_irq(&dev_priv->irq_lock);

	vlv_display_irq_postinstall(display);

	spin_unlock_irq(&dev_priv->irq_lock);



	intel_uncore_write(&dev_priv->uncore, GEN8_MASTER_IRQ, GEN8_MASTER_IRQ_CONTROL);

	intel_uncore_posting_read(&dev_priv->uncore, GEN8_MASTER_IRQ);