From: Brian Masney <bmasney@redhat.com>
To: Philipp Zabel <p.zabel@pengutronix.de>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>,
Simona Vetter <simona@ffwll.ch>, Shawn Guo <shawnguo@kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>,
Linus Walleij <linus.walleij@linaro.org>,
Rob Clark <robin.clark@oss.qualcomm.com>,
Dmitry Baryshkov <lumag@kernel.org>,
Abhinav Kumar <abhinav.kumar@linux.dev>,
Jessica Zhang <jessica.zhang@oss.qualcomm.com>,
Sean Paul <sean@poorly.run>,
Marijn Suijten <marijn.suijten@somainline.org>,
Yannick Fertre <yannick.fertre@foss.st.com>,
Raphael Gallais-Pou <raphael.gallais-pou@foss.st.com>,
Philippe Cornu <philippe.cornu@foss.st.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@foss.st.com>,
Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Stephen Boyd <sboyd@kernel.org>
Cc: dri-devel@lists.freedesktop.org, imx@lists.linux.dev,
linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
freedreno@lists.freedesktop.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-sunxi@lists.linux.dev, Brian Masney <bmasney@redhat.com>
Subject: [PATCH 0/9] drm: convert from clk round_rate() to determine_rate()
Date: Thu, 10 Jul 2025 13:43:01 -0400 [thread overview]
Message-ID: <20250710-drm-clk-round-rate-v1-0-601b9ea384c3@redhat.com> (raw)
The round_rate() clk ops is deprecated in the clk framework in favor
of the determine_rate() clk ops, so let's go ahead and convert the
drivers in the drm subsystem using the Coccinelle semantic patch
posted below. I did a few minor cosmetic cleanups of the code in a
few cases.
Coccinelle semantic patch:
virtual patch
// Look up the current name of the round_rate function
@ has_round_rate @
identifier round_rate_name =~ ".*_round_rate";
identifier hw_param, rate_param, parent_rate_param;
@@
long round_rate_name(struct clk_hw *hw_param, unsigned long rate_param,
unsigned long *parent_rate_param)
{
...
}
// Rename the route_rate function name to determine_rate()
@ script:python generate_name depends on has_round_rate @
round_rate_name << has_round_rate.round_rate_name;
new_name;
@@
coccinelle.new_name = round_rate_name.replace("_round_rate", "_determine_rate")
// Change rate to req->rate; also change occurrences of 'return XXX'.
@ chg_rate depends on generate_name @
identifier has_round_rate.round_rate_name;
identifier has_round_rate.hw_param;
identifier has_round_rate.rate_param;
identifier has_round_rate.parent_rate_param;
identifier ERR =~ "E.*";
expression E;
@@
long round_rate_name(struct clk_hw *hw_param, unsigned long rate_param,
unsigned long *parent_rate_param)
{
<...
(
-return -ERR;
+return -ERR;
|
- return rate_param;
+ return 0;
|
- return E;
+ req->rate = E;
+
+ return 0;
|
- rate_param
+ req->rate
)
...>
}
// Coccinelle only transforms the first occurrence of the rate parameter
// Run a second time. FIXME: Is there a better way to do this?
@ chg_rate2 depends on generate_name @
identifier has_round_rate.round_rate_name;
identifier has_round_rate.hw_param;
identifier has_round_rate.rate_param;
identifier has_round_rate.parent_rate_param;
@@
long round_rate_name(struct clk_hw *hw_param, unsigned long rate_param,
unsigned long *parent_rate_param)
{
<...
- rate_param
+ req->rate
...>
}
// Change parent_rate to req->best_parent_rate
@ chg_parent_rate depends on generate_name @
identifier has_round_rate.round_rate_name;
identifier has_round_rate.hw_param;
identifier has_round_rate.rate_param;
identifier has_round_rate.parent_rate_param;
@@
long round_rate_name(struct clk_hw *hw_param, unsigned long rate_param,
unsigned long *parent_rate_param)
{
<...
(
- *parent_rate_param
+ req->best_parent_rate
|
- parent_rate_param
+ &req->best_parent_rate
)
...>
}
// Convert the function definition from round_rate() to determine_rate()
@ func_definition depends on chg_rate @
identifier has_round_rate.round_rate_name;
identifier has_round_rate.hw_param;
identifier has_round_rate.rate_param;
identifier has_round_rate.parent_rate_param;
identifier generate_name.new_name;
@@
- long round_rate_name(struct clk_hw *hw_param, unsigned long rate_param,
- unsigned long *parent_rate_param)
+ int new_name(struct clk_hw *hw, struct clk_rate_request *req)
{
...
}
// Update the ops from round_rate() to determine_rate()
@ ops depends on func_definition @
identifier has_round_rate.round_rate_name;
identifier generate_name.new_name;
@@
{
...,
- .round_rate = round_rate_name,
+ .determine_rate = new_name,
...,
}
Note that I used coccinelle 1.2 instead of 1.3 since the newer version
adds unnecessary braces as described in this post.
https://lore.kernel.org/cocci/67642477-5f3e-4b2a-914d-579a54f48cbd@intel.com/
Signed-off-by: Brian Masney <bmasney@redhat.com>
---
Brian Masney (9):
drm/imx/ipuv3/imx-tve: convert from round_rate() to determine_rate()
drm/mcde/mcde_clk_div: convert from round_rate() to determine_rate()
drm/msm/disp/mdp4/mdp4_lvds_pll: convert from round_rate() to determine_rate()
drm/msm/hdmi_pll_8960: convert from round_rate() to determine_rate()
drm/pl111: convert from round_rate() to determine_rate()
drm/stm/dw_mipi_dsi-stm: convert from round_rate() to determine_rate()
drm/stm/lvds: convert from round_rate() to determine_rate()
drm/sun4i/sun4i_hdmi_ddc_clk: convert from round_rate() to determine_rate()
drm/sun4i/sun4i_tcon_dclk: convert from round_rate() to determine_rate()
drivers/gpu/drm/imx/ipuv3/imx-tve.c | 17 ++++++++++-------
drivers/gpu/drm/mcde/mcde_clk_div.c | 13 ++++++++-----
drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_pll.c | 13 ++++++++-----
drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 12 +++++++-----
drivers/gpu/drm/pl111/pl111_display.c | 13 ++++++++-----
drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 14 ++++++++------
drivers/gpu/drm/stm/lvds.c | 12 +++++++-----
drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c | 12 +++++++-----
drivers/gpu/drm/sun4i/sun4i_tcon_dclk.c | 18 ++++++++++--------
9 files changed, 73 insertions(+), 51 deletions(-)
---
base-commit: b551c4e2a98a177a06148cf16505643cd2108386
change-id: 20250710-drm-clk-round-rate-b25099c0c3a7
Best regards,
--
Brian Masney <bmasney@redhat.com>
next reply other threads:[~2025-07-10 17:43 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-10 17:43 Brian Masney [this message]
2025-07-10 17:43 ` [PATCH 1/9] drm/imx/ipuv3/imx-tve: convert from round_rate() to determine_rate() Brian Masney
2025-07-10 17:43 ` [PATCH 2/9] drm/mcde/mcde_clk_div: " Brian Masney
2025-07-11 17:44 ` Linus Walleij
2025-07-10 17:43 ` [PATCH 3/9] drm/msm/disp/mdp4/mdp4_lvds_pll: " Brian Masney
2025-07-11 10:00 ` Konrad Dybcio
2025-07-15 15:12 ` Dmitry Baryshkov
2025-07-10 17:43 ` [PATCH 4/9] drm/msm/hdmi_pll_8960: " Brian Masney
2025-07-11 10:00 ` Konrad Dybcio
2025-07-15 15:07 ` Dmitry Baryshkov
2025-07-10 17:43 ` [PATCH 5/9] drm/pl111: " Brian Masney
2025-07-11 17:44 ` Linus Walleij
2025-07-10 17:43 ` [PATCH 6/9] drm/stm/dw_mipi_dsi-stm: " Brian Masney
2025-07-15 14:29 ` Raphael Gallais-Pou
2025-07-10 17:43 ` [PATCH 7/9] drm/stm/lvds: " Brian Masney
2025-07-15 14:30 ` Raphael Gallais-Pou
2025-07-10 17:43 ` [PATCH 8/9] drm/sun4i/sun4i_hdmi_ddc_clk: " Brian Masney
2025-07-11 7:04 ` Maxime Ripard
2025-07-10 17:43 ` [PATCH 9/9] drm/sun4i/sun4i_tcon_dclk: " Brian Masney
2025-07-11 7:05 ` Maxime Ripard
2025-07-30 21:44 ` Brian Masney
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=20250710-drm-clk-round-rate-v1-0-601b9ea384c3@redhat.com \
--to=bmasney@redhat.com \
--cc=abhinav.kumar@linux.dev \
--cc=airlied@gmail.com \
--cc=alexandre.torgue@foss.st.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=festevam@gmail.com \
--cc=freedreno@lists.freedesktop.org \
--cc=imx@lists.linux.dev \
--cc=jernej.skrabec@gmail.com \
--cc=jessica.zhang@oss.qualcomm.com \
--cc=kernel@pengutronix.de \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux-sunxi@lists.linux.dev \
--cc=lumag@kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=marijn.suijten@somainline.org \
--cc=mcoquelin.stm32@gmail.com \
--cc=mripard@kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=philippe.cornu@foss.st.com \
--cc=raphael.gallais-pou@foss.st.com \
--cc=robin.clark@oss.qualcomm.com \
--cc=s.hauer@pengutronix.de \
--cc=samuel@sholland.org \
--cc=sboyd@kernel.org \
--cc=sean@poorly.run \
--cc=shawnguo@kernel.org \
--cc=simona@ffwll.ch \
--cc=tzimmermann@suse.de \
--cc=wens@csie.org \
--cc=yannick.fertre@foss.st.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).