On Mon, 17 Aug 2026, Luca Coelho <[email protected]> wrote: > Instead of exporting many of the display clock gating functions, > consolidate them into a single function that checks the platform and > calls the appropriate platform-specific function. > > Start consolidating the Gen 9 functions first into a new > intel_display_init_clock_gating() function. > > Signed-off-by: Luca Coelho <[email protected]>
Reviewed-by: Jani Nikula <[email protected]> > --- > .../i915/display/intel_display_clock_gating.c | 24 +++++++++++++++---- > .../i915/display/intel_display_clock_gating.h | 6 +---- > drivers/gpu/drm/i915/intel_clock_gating.c | 10 ++++---- > 3 files changed, 25 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_clock_gating.c > b/drivers/gpu/drm/i915/display/intel_display_clock_gating.c > index d036c7e5863d..d5ecdaeab421 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_clock_gating.c > +++ b/drivers/gpu/drm/i915/display/intel_display_clock_gating.c > @@ -27,7 +27,7 @@ static void intel_display_gen9_init_clock_gating(struct > intel_display *display) > intel_de_rmw(display, DISP_ARB_CTL, 0, DISP_FBC_MEMORY_WAKE); > } > > -void intel_display_skl_init_clock_gating(struct intel_display *display) > +static void intel_display_skl_init_clock_gating(struct intel_display > *display) > { > /* > * WaCompressedResourceDisplayNewHashMode:skl,kbl > @@ -47,7 +47,7 @@ void intel_display_skl_init_clock_gating(struct > intel_display *display) > intel_de_rmw(display, DISP_ARB_CTL, 0, DISP_FBC_WM_DIS); > } > > -void intel_display_kbl_init_clock_gating(struct intel_display *display) > +static void intel_display_kbl_init_clock_gating(struct intel_display > *display) > { > /* > * WaCompressedResourceDisplayNewHashMode:skl,kbl > @@ -67,7 +67,7 @@ void intel_display_kbl_init_clock_gating(struct > intel_display *display) > intel_de_rmw(display, DISP_ARB_CTL, 0, DISP_FBC_WM_DIS); > } > > -void intel_display_cfl_init_clock_gating(struct intel_display *display) > +static void intel_display_cfl_init_clock_gating(struct intel_display > *display) > { > /* > * WaCompressedResourceDisplayNewHashMode:skl,kbl (and cfl, cml) > @@ -93,7 +93,7 @@ void intel_display_cfl_init_clock_gating(struct > intel_display *display) > intel_de_rmw(display, DISP_ARB_CTL, 0, DISP_FBC_WM_DIS); > } > > -void intel_display_bxt_init_clock_gating(struct intel_display *display) > +static void intel_display_bxt_init_clock_gating(struct intel_display > *display) > { > intel_display_gen9_init_clock_gating(display); > > @@ -120,7 +120,7 @@ void intel_display_bxt_init_clock_gating(struct > intel_display *display) > intel_de_rmw(display, DISP_ARB_CTL, 0, DISP_FBC_WM_DIS); > } > > -void intel_display_glk_init_clock_gating(struct intel_display *display) > +static void intel_display_glk_init_clock_gating(struct intel_display > *display) > { > intel_display_gen9_init_clock_gating(display); > > @@ -268,3 +268,17 @@ void intel_display_i965gm_init_clock_gating(struct > intel_display *display) > { > intel_de_write(display, DSPCLK_GATE_D, 0); > } > + > +void intel_display_init_clock_gating(struct intel_display *display) > +{ > + if (display->platform.skylake) > + intel_display_skl_init_clock_gating(display); > + else if (display->platform.kabylake) > + intel_display_kbl_init_clock_gating(display); > + else if (display->platform.coffeelake || display->platform.cometlake) > + intel_display_cfl_init_clock_gating(display); > + else if (display->platform.broxton) > + intel_display_bxt_init_clock_gating(display); > + else if (display->platform.geminilake) > + intel_display_glk_init_clock_gating(display); > +} > diff --git a/drivers/gpu/drm/i915/display/intel_display_clock_gating.h > b/drivers/gpu/drm/i915/display/intel_display_clock_gating.h > index b6dd34ca92dd..4e50e388656a 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_clock_gating.h > +++ b/drivers/gpu/drm/i915/display/intel_display_clock_gating.h > @@ -8,11 +8,7 @@ > > struct intel_display; > > -void intel_display_skl_init_clock_gating(struct intel_display *display); > -void intel_display_kbl_init_clock_gating(struct intel_display *display); > -void intel_display_cfl_init_clock_gating(struct intel_display *display); > -void intel_display_bxt_init_clock_gating(struct intel_display *display); > -void intel_display_glk_init_clock_gating(struct intel_display *display); > +void intel_display_init_clock_gating(struct intel_display *display); > void intel_display_bdw_clock_gating_disable_fbcq(struct intel_display > *display); > void intel_display_bdw_clock_gating_vblank_in_srd(struct intel_display > *display); > void intel_display_bdw_clock_gating_kvm_notif(struct intel_display *display); > diff --git a/drivers/gpu/drm/i915/intel_clock_gating.c > b/drivers/gpu/drm/i915/intel_clock_gating.c > index 86bdeb20f427..84f838c660fd 100644 > --- a/drivers/gpu/drm/i915/intel_clock_gating.c > +++ b/drivers/gpu/drm/i915/intel_clock_gating.c > @@ -57,12 +57,12 @@ static void bxt_init_clock_gating(struct drm_i915_private > *i915) > */ > intel_uncore_rmw(&i915->uncore, GEN8_UCGCTL6, 0, > GEN8_HDCUNIT_CLOCK_GATE_DISABLE_HDCREQ); > > - intel_display_bxt_init_clock_gating(i915->display); > + intel_display_init_clock_gating(i915->display); > } > > static void glk_init_clock_gating(struct drm_i915_private *i915) > { > - intel_display_glk_init_clock_gating(i915->display); > + intel_display_init_clock_gating(i915->display); > } > > static void ilk_init_clock_gating(struct drm_i915_private *i915) > @@ -170,7 +170,7 @@ static void cfl_init_clock_gating(struct drm_i915_private > *i915) > /* WAC6entrylatency:cfl */ > intel_uncore_rmw(&i915->uncore, FBC_LLC_READ_CTRL, 0, > FBC_LLC_FULLY_OPEN); > > - intel_display_cfl_init_clock_gating(i915->display); > + intel_display_init_clock_gating(i915->display); > } > > static void kbl_init_clock_gating(struct drm_i915_private *i915) > @@ -188,7 +188,7 @@ static void kbl_init_clock_gating(struct drm_i915_private > *i915) > intel_uncore_rmw(&i915->uncore, GEN6_UCGCTL1, > 0, GEN6_GAMUNIT_CLOCK_GATE_DISABLE); > > - intel_display_kbl_init_clock_gating(i915->display); > + intel_display_init_clock_gating(i915->display); > } > > static void skl_init_clock_gating(struct drm_i915_private *i915) > @@ -200,7 +200,7 @@ static void skl_init_clock_gating(struct drm_i915_private > *i915) > /* WAC6entrylatency:skl */ > intel_uncore_rmw(&i915->uncore, FBC_LLC_READ_CTRL, 0, > FBC_LLC_FULLY_OPEN); > > - intel_display_skl_init_clock_gating(i915->display); > + intel_display_init_clock_gating(i915->display); > } > > static void bdw_init_clock_gating(struct drm_i915_private *i915) -- Jani Nikula, Intel
