Skip to content

Commit 0c61417

Browse files
committed
drm/i915/irq: split out i965_display_irq_postinstall()
Split out i965_display_irq_postinstall() similar to other platforms. Reviewed-by: Gustavo Sousa <[email protected]> Link: https://lore.kernel.org/r/5d404dcd0c606d1cb11f2e09c45e151a75b5b2c6.1746536745.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <[email protected]>
1 parent 4c05cef commit 0c61417

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1918,6 +1918,23 @@ void i915_display_irq_postinstall(struct intel_display *display)
19181918
i915_enable_asle_pipestat(display);
19191919
}
19201920

1921+
void i965_display_irq_postinstall(struct intel_display *display)
1922+
{
1923+
struct drm_i915_private *dev_priv = to_i915(display->drm);
1924+
1925+
/*
1926+
* Interrupt setup is already guaranteed to be single-threaded, this is
1927+
* just to make the assert_spin_locked check happy.
1928+
*/
1929+
spin_lock_irq(&dev_priv->irq_lock);
1930+
i915_enable_pipestat(display, PIPE_A, PIPE_GMBUS_INTERRUPT_STATUS);
1931+
i915_enable_pipestat(display, PIPE_A, PIPE_CRC_DONE_INTERRUPT_STATUS);
1932+
i915_enable_pipestat(display, PIPE_B, PIPE_CRC_DONE_INTERRUPT_STATUS);
1933+
spin_unlock_irq(&dev_priv->irq_lock);
1934+
1935+
i915_enable_asle_pipestat(display);
1936+
}
1937+
19211938
static u32 vlv_error_mask(void)
19221939
{
19231940
/* TODO enable other errors too? */

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ void gen8_display_irq_reset(struct intel_display *display);
6262
void gen11_display_irq_reset(struct intel_display *display);
6363

6464
void i915_display_irq_postinstall(struct intel_display *display);
65+
void i965_display_irq_postinstall(struct intel_display *display);
6566
void vlv_display_irq_postinstall(struct intel_display *display);
6667
void ilk_de_irq_postinstall(struct intel_display *display);
6768
void gen8_de_irq_postinstall(struct intel_display *display);

drivers/gpu/drm/i915/i915_irq.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,15 +1053,7 @@ static void i965_irq_postinstall(struct drm_i915_private *dev_priv)
10531053

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

1056-
/* Interrupt setup is already guaranteed to be single-threaded, this is
1057-
* just to make the assert_spin_locked check happy. */
1058-
spin_lock_irq(&dev_priv->irq_lock);
1059-
i915_enable_pipestat(display, PIPE_A, PIPE_GMBUS_INTERRUPT_STATUS);
1060-
i915_enable_pipestat(display, PIPE_A, PIPE_CRC_DONE_INTERRUPT_STATUS);
1061-
i915_enable_pipestat(display, PIPE_B, PIPE_CRC_DONE_INTERRUPT_STATUS);
1062-
spin_unlock_irq(&dev_priv->irq_lock);
1063-
1064-
i915_enable_asle_pipestat(display);
1056+
i965_display_irq_postinstall(display);
10651057
}
10661058

10671059
static irqreturn_t i965_irq_handler(int irq, void *arg)

0 commit comments

Comments
 (0)