From: Jani Nikula <jani.nikula@linux.intel.com>
To: Luca Coelho <luciano.coelho@intel.com>, intel-gfx@lists.freedesktop.org
Cc: intel-xe@lists.freedesktop.org
Subject: Re: [PATCH v3 1/5] drm/i915/display: consolidate Gen9 clock gating initialization
Date: Thu, 27 Aug 2026 10:24:09 +0300 [thread overview]
Message-ID: <c4ffe94d9f37bfadbdf7efaade1d5a063617b63f@intel.com> (raw)
In-Reply-To: <20260817092911.342072-2-luciano.coelho@intel.com>
On Mon, 17 Aug 2026, Luca Coelho <luciano.coelho@intel.com> 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 <luciano.coelho@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> .../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
next prev parent reply other threads:[~2026-08-27 7:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-17 9:26 [PATCH v3 0/5] drm/i915/display: reduce clock_gating interface between core and display Luca Coelho
2026-08-17 9:26 ` [PATCH v3 1/5] drm/i915/display: consolidate Gen9 clock gating initialization Luca Coelho
2026-08-27 7:24 ` Jani Nikula [this message]
2026-08-17 9:26 ` [PATCH v3 2/5] drm/i915/display: consolidate remaining " Luca Coelho
2026-08-27 7:27 ` Jani Nikula
2026-08-17 9:26 ` [PATCH v3 3/5] drm/i915/display: remove unnecessary clock_gating include from intel_display.c Luca Coelho
2026-08-27 7:28 ` Jani Nikula
2026-08-31 8:13 ` Luca Coelho
2026-08-17 9:26 ` [PATCH v3 4/5] drm/i915/display: add a way to restore only display/pch registers in clock_gating Luca Coelho
2026-08-17 9:49 ` sashiko-bot
2026-08-17 9:26 ` [PATCH v3 5/5] drm/i915/display: split part of intel_display_reset_finish() to a new function Luca Coelho
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c4ffe94d9f37bfadbdf7efaade1d5a063617b63f@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=luciano.coelho@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).