Commit 4c05cef0 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/irq: split out i915_display_irq_postinstall() 



Split out i915_display_irq_postinstall() similar to other platforms.

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


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

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

+16 −0
Original line number Diff line number Diff line
@@ -1902,6 +1902,22 @@ void i9xx_display_irq_reset(struct intel_display *display) 
	i9xx_pipestat_irq_reset(display);

}



void i915_display_irq_postinstall(struct intel_display *display)

{

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



	/*

	 * Interrupt setup is already guaranteed to be single-threaded, this is

	 * just to make the assert_spin_locked check happy.

	 */

	spin_lock_irq(&dev_priv->irq_lock);

	i915_enable_pipestat(display, PIPE_A, PIPE_CRC_DONE_INTERRUPT_STATUS);

	i915_enable_pipestat(display, PIPE_B, PIPE_CRC_DONE_INTERRUPT_STATUS);

	spin_unlock_irq(&dev_priv->irq_lock);



	i915_enable_asle_pipestat(display);

}



static u32 vlv_error_mask(void)

{

	/* TODO enable other errors too? */

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

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ void vlv_display_irq_reset(struct intel_display *display); 
void gen8_display_irq_reset(struct intel_display *display);

void gen11_display_irq_reset(struct intel_display *display);



void i915_display_irq_postinstall(struct intel_display *display);

void vlv_display_irq_postinstall(struct intel_display *display);

void ilk_de_irq_postinstall(struct intel_display *display);

void gen8_de_irq_postinstall(struct intel_display *display);

drivers/gpu/drm/i915/i915_irq.c

+1 −8
Original line number Diff line number Diff line
@@ -935,14 +935,7 @@ static void i915_irq_postinstall(struct drm_i915_private *dev_priv) 


	gen2_irq_init(uncore, GEN2_IRQ_REGS, dev_priv->irq_mask, enable_mask);



	/* Interrupt setup is already guaranteed to be single-threaded, this is

	 * just to make the assert_spin_locked check happy. */

	spin_lock_irq(&dev_priv->irq_lock);

	i915_enable_pipestat(display, PIPE_A, PIPE_CRC_DONE_INTERRUPT_STATUS);

	i915_enable_pipestat(display, PIPE_B, PIPE_CRC_DONE_INTERRUPT_STATUS);

	spin_unlock_irq(&dev_priv->irq_lock);



	i915_enable_asle_pipestat(display);

	i915_display_irq_postinstall(display);

}



static irqreturn_t i915_irq_handler(int irq, void *arg)