Hi Jani,
On Fri, 12 Sep 2025, Jani Nikula wrote:
This is v2 of [1]. There were issues with sideband get/put, discovered
in CI, so I ended up doing what Ville suggested in [2], and handling
sideband get/put inside the functions. This is done in new patches 1-2,
which obviously caused some rebase churn in the rest. I also removed
vlv_get_cck_clock_hpll() completely, this is new patch 11.
I added r-b/ack from the previous version in some patches, dropped them
from others, depending on how much changes there were. Sorry about the
trouble, please look into this again.
BR,
Jani.
[1] https://lore.kernel.org/r/cover.1755607980.git.jani.nik...@intel.com
[2] https://lore.kernel.org/r/amaqlvaw2nqlw...@intel.com
Jani Nikula (15):
drm/i915: do cck get/put inside vlv_get_hpll_vco()
drm/i915: do cck get/put inside vlv_get_cck_clock()
drm/i915: add vlv_clock_get_gpll()
drm/i915: add vlv_clock_get_czclk()
drm/i915: add vlv_clock_get_hrawclk()
drm/i915: make vlv_get_cck_clock_hpll() static
drm/i915: add vlv_clock_get_cdclk()
drm/i915: make vlv_get_cck_clock() static
drm/i915: rename vlv_get_hpll_vco() to vlv_clock_get_hpll_vco()
drm/i915: cache the results in vlv_clock_get_hpll_vco() and use it
more
drm/i915: remove vlv_get_cck_clock_hpll()
drm/i915: remove intel_update_czclk() as unnecessary
drm/i915: log HPLL frequency similar to CZCLK
drm/i915: move hpll and czclk caching under display
drm/i915: split out vlv_clock.[ch]
Although I have just issued my r-b on the rest of the series, I would
have one question. Can't we add on top of the series a separate commit
with rename of vlv_get_cck_clock() into vlv_clock_get_cck()? It would
be more consistent with the rest of the function names in vlv_clock.c.
Patch with what I am meaning is in the attachment.
BR,
Michał
From 084926eea9cc5347fef6ea3d1f9f0c42e510f5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Grzelak?= <michal.grze...@intel.com>
Date: Thu, 18 Sep 2025 13:43:16 +0200
Subject: [PATCH] drm/i915: rename vlv_get_cck_clock() to vlv_clock_get_cck()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316
Keep the convention of naming vlv_clock* instead of vlv_*_clock.
Signed-off-by: MichaÅ Grzelak <michal.grze...@intel.com>
---
drivers/gpu/drm/i915/display/vlv_clock.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/vlv_clock.c b/drivers/gpu/drm/i915/display/vlv_clock.c
index 2c55083d8fdb..e4499cbf4420 100644
--- a/drivers/gpu/drm/i915/display/vlv_clock.c
+++ b/drivers/gpu/drm/i915/display/vlv_clock.c
@@ -29,7 +29,7 @@ int vlv_clock_get_hpll_vco(struct drm_device *drm)
return display->vlv_clock.hpll_freq;
}
-static int vlv_get_cck_clock(struct drm_device *drm,
+static int vlv_clock_get_cck(struct drm_device *drm,
const char *name, u32 reg, int ref_freq)
{
u32 val;
@@ -51,7 +51,7 @@ static int vlv_get_cck_clock(struct drm_device *drm,
int vlv_clock_get_hrawclk(struct drm_device *drm)
{
/* RAWCLK_FREQ_VLV register updated from power well code */
- return vlv_get_cck_clock(drm, "hrawclk", CCK_DISPLAY_REF_CLOCK_CONTROL,
+ return vlv_clock_get_cck(drm, "hrawclk", CCK_DISPLAY_REF_CLOCK_CONTROL,
vlv_clock_get_hpll_vco(drm));
}
@@ -60,7 +60,7 @@ int vlv_clock_get_czclk(struct drm_device *drm)
struct intel_display *display = to_intel_display(drm);
if (!display->vlv_clock.czclk_freq) {
- display->vlv_clock.czclk_freq = vlv_get_cck_clock(drm, "czclk", CCK_CZ_CLOCK_CONTROL,
+ display->vlv_clock.czclk_freq = vlv_clock_get_cck(drm, "czclk", CCK_CZ_CLOCK_CONTROL,
vlv_clock_get_hpll_vco(drm));
drm_dbg_kms(drm, "CZ clock rate: %d kHz\n", display->vlv_clock.czclk_freq);
}
@@ -70,12 +70,12 @@ int vlv_clock_get_czclk(struct drm_device *drm)
int vlv_clock_get_cdclk(struct drm_device *drm)
{
- return vlv_get_cck_clock(drm, "cdclk", CCK_DISPLAY_CLOCK_CONTROL,
+ return vlv_clock_get_cck(drm, "cdclk", CCK_DISPLAY_CLOCK_CONTROL,
vlv_clock_get_hpll_vco(drm));
}
int vlv_clock_get_gpll(struct drm_device *drm)
{
- return vlv_get_cck_clock(drm, "GPLL ref", CCK_GPLL_CLOCK_CONTROL,
+ return vlv_clock_get_cck(drm, "GPLL ref", CCK_GPLL_CLOCK_CONTROL,
vlv_clock_get_czclk(drm));
}
--
2.45.2
