On Wed, May 13, 2026 at 01:10:06PM +0300, Jani Nikula wrote: > dg1_de_irq_postinstall() and gen11_de_irq_postinstall() are exactly the > same. Remove dg1_de_irq_postinstall() and call > gen11_de_irq_postinstall() instead. > > Signed-off-by: Jani Nikula <[email protected]>
Reviewed-by: Ville Syrjälä <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_display_irq.c | 9 --------- > drivers/gpu/drm/i915/display/intel_display_irq.h | 1 - > drivers/gpu/drm/i915/i915_irq.c | 2 +- > 3 files changed, 1 insertion(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c > b/drivers/gpu/drm/i915/display/intel_display_irq.c > index b5bfdebc66ca..bf4b5e7b6011 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_irq.c > +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c > @@ -2449,15 +2449,6 @@ void gen11_de_irq_postinstall(struct intel_display > *display) > intel_de_write(display, GEN11_DISPLAY_INT_CTL, > GEN11_DISPLAY_IRQ_ENABLE); > } > > -void dg1_de_irq_postinstall(struct intel_display *display) > -{ > - if (!HAS_DISPLAY(display)) > - return; > - > - gen8_de_irq_postinstall(display); > - intel_de_write(display, GEN11_DISPLAY_INT_CTL, > GEN11_DISPLAY_IRQ_ENABLE); > -} > - > struct intel_display_irq_funcs { > void (*reset)(struct intel_display *display); > }; > diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.h > b/drivers/gpu/drm/i915/display/intel_display_irq.h > index b25d180254d7..e2b1674fae06 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_irq.h > +++ b/drivers/gpu/drm/i915/display/intel_display_irq.h > @@ -71,7 +71,6 @@ 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); > void gen11_de_irq_postinstall(struct intel_display *display); > -void dg1_de_irq_postinstall(struct intel_display *display); > > u32 i915_pipestat_enable_mask(struct intel_display *display, enum pipe pipe); > void i915_enable_pipestat(struct intel_display *display, enum pipe pipe, u32 > status_mask); > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index d4d8dd0a4174..ef9eadf38a53 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -778,7 +778,7 @@ static void dg1_irq_postinstall(struct drm_i915_private > *dev_priv) > > gen2_irq_init(uncore, GEN11_GU_MISC_IRQ_REGS, ~gu_misc_masked, > gu_misc_masked); > > - dg1_de_irq_postinstall(display); > + gen11_de_irq_postinstall(display); > > dg1_master_intr_enable(intel_uncore_regs(uncore)); > intel_uncore_posting_read(uncore, DG1_MSTR_TILE_INTR); > -- > 2.47.3 -- Ville Syrjälä Intel
