On Thu, 05 Nov 2026, Ville Syrjala <[email protected]> wrote: > From: Ville Syrjälä <[email protected]> > > Now that gen11_gu_misc_irq_handler() just handles the GSE > interrupt let's rename it to intel_display_gse_irq_handler(). > > And now that it's our generic GSE irq handler let's also > call it for all the GSE interrupts signaled via actual > display interrupts as well. The old GMCH ASLE/BLC interrupts > I left calling intel_opregion_asle_intr() directly, just > because the naming there makes more sense that way. > > Signed-off-by: Ville Syrjälä <[email protected]>
Reviewed-by: Jani Nikula <[email protected]> This could be followed up with having xe_display_irq_enable() call intel_display_gse_irq_handler() instead of intel_opregion_asle_intr(). Oh, and xe_display_irq_enable() is also misnamed. > --- > drivers/gpu/drm/i915/display/intel_display_irq.c | 8 ++++---- > drivers/gpu/drm/i915/display/intel_display_irq.h | 2 +- > drivers/gpu/drm/i915/i915_irq.c | 4 ++-- > 3 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c > b/drivers/gpu/drm/i915/display/intel_display_irq.c > index af8d6737d36c..5430eb5245da 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_irq.c > +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c > @@ -904,7 +904,7 @@ static void _ilk_display_irq_handler(struct intel_display > *display, u32 de_iir) > intel_dp_aux_irq_handler(display); > > if (de_iir & DE_GSE) > - intel_opregion_asle_intr(display); > + intel_display_gse_irq_handler(display); > > if (de_iir & DE_POISON) > drm_err(display->drm, "Poison interrupt\n"); > @@ -971,7 +971,7 @@ static void _ivb_display_irq_handler(struct intel_display > *display, u32 de_iir) > intel_dp_aux_irq_handler(display); > > if (de_iir & DE_GSE_IVB) > - intel_opregion_asle_intr(display); > + intel_display_gse_irq_handler(display); > > for_each_pipe(display, pipe) { > if (de_iir & DE_PIPE_VBLANK_IVB(pipe)) > @@ -1279,7 +1279,7 @@ gen8_de_misc_irq_handler(struct intel_display *display, > u32 iir) > found = true; > } > } else if (iir & GEN8_DE_MISC_GSE) { > - intel_opregion_asle_intr(display); > + intel_display_gse_irq_handler(display); > found = true; > } > > @@ -1587,7 +1587,7 @@ static bool gen8_display_irq_handler(struct > intel_display *display, > return true; > } > > -void gen11_gu_misc_irq_handler(struct intel_display *display) > +void intel_display_gse_irq_handler(struct intel_display *display) > { > intel_opregion_asle_intr(display); > } > diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.h > b/drivers/gpu/drm/i915/display/intel_display_irq.h > index 00dfed88eab7..1fd11328a264 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_irq.h > +++ b/drivers/gpu/drm/i915/display/intel_display_irq.h > @@ -52,7 +52,7 @@ void bdw_disable_vblank(struct drm_crtc *crtc); > void ilk_display_irq_master_disable(struct intel_display *display, u32 > *de_ier, u32 *sde_ier); > void ilk_display_irq_master_enable(struct intel_display *display, u32 > de_ier, u32 sde_ier); > > -void gen11_gu_misc_irq_handler(struct intel_display *display); > +void intel_display_gse_irq_handler(struct intel_display *display); > > struct intel_display_irq_state { > u32 master_ctl; > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 1d03ac90b7e2..12082167face 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -536,7 +536,7 @@ static irqreturn_t gen11_irq_handler(int irq, void *arg) > gen11_master_intr_enable(regs); > > if (gu_misc_iir & GEN11_GU_MISC_GSE) > - gen11_gu_misc_irq_handler(display); > + intel_display_gse_irq_handler(display); > > pmu_irq_stats(i915, IRQ_HANDLED); > > @@ -604,7 +604,7 @@ static irqreturn_t dg1_irq_handler(int irq, void *arg) > dg1_master_intr_enable(regs); > > if (gu_misc_iir & GEN11_GU_MISC_GSE) > - gen11_gu_misc_irq_handler(display); > + intel_display_gse_irq_handler(display); > > pmu_irq_stats(i915, IRQ_HANDLED); -- Jani Nikula, Intel
