public inbox for linux-clk@vger.kernel.org
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime@cerno.tech>
To: Mike Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@kernel.org>,
	linux-clk@vger.kernel.org
Cc: Jerome Brunet <jbrunet@baylibre.com>,
	Alexander Stein <alexander.stein@ew.tq-group.com>,
	Naresh Kamboju <naresh.kamboju@linaro.org>,
	Yassine Oudjana <y.oudjana@protonmail.com>,
	Marek Szyprowski <m.szyprowski@samsung.com>,
	Neil Armstrong <narmstrong@baylibre.com>,
	Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
	Tony Lindgren <tony@atomide.com>,
	Maxime Ripard <maxime@cerno.tech>
Subject: [PATCH v3 04/28] drm/vc4: hdmi: Rework hdmi_enable_4kp60 detection
Date: Wed, 11 May 2022 16:42:25 +0200	[thread overview]
Message-ID: <20220511144249.354775-5-maxime@cerno.tech> (raw)
In-Reply-To: <20220511144249.354775-1-maxime@cerno.tech>

In order to support higher HDMI frequencies, users have to set the
hdmi_enable_4kp60 parameter in their config.txt file.

We were detecting this so far by calling clk_round_rate() on the core
clock with the frequency we're supposed to run at when one of those
modes is enabled. Whether or not the parameter was enabled could then be
inferred by the returned rate since the maximum clock rate reported by
the firmware was one of the side effect of setting that parameter.

However, the recent clock rework we did changed what clk_round_rate()
was returning to always return the minimum allowed, and thus this test
wasn't reliable anymore.

Let's use the new clk_get_max_rate() function to reliably determine the
maximum rate allowed on that clock and fix the 4k@60Hz output.

Fixes: e9d6cea2af1c ("clk: bcm: rpi: Run some clocks at the minimum rate allowed")
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
 drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 6aadb65eb640..962a1b9b1c4f 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -2891,7 +2891,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
 
 	if (variant->max_pixel_clock == 600000000) {
 		struct vc4_dev *vc4 = to_vc4_dev(drm);
-		long max_rate = clk_round_rate(vc4->hvs->core_clk, 550000000);
+		unsigned long max_rate = clk_get_max_rate(vc4->hvs->core_clk);
 
 		if (max_rate < 550000000)
 			vc4_hdmi->disable_4kp60 = true;
-- 
2.36.1


  parent reply	other threads:[~2022-05-11 14:43 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-11 14:42 [PATCH v3 00/28] clk: More clock rate fixes and tests Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 01/28] clk: Drop the rate range on clk_put() Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 02/28] clk: Skip clamping when rounding if there's no boundaries Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 03/28] clk: Introduce clk_get_rate_range() Maxime Ripard
2022-05-11 14:42 ` Maxime Ripard [this message]
2022-05-11 14:42 ` [PATCH v3 05/28] clk: Mention that .recalc_rate can return 0 on error Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 06/28] clk: Clarify clk_get_rate() expectations Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 07/28] clk: tests: Add test suites description Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 08/28] clk: tests: Add reference to the orphan mux bug report Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 09/28] clk: tests: Add tests for uncached clock Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 10/28] clk: tests: Add tests for single parent mux Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 11/28] clk: tests: Add tests for mux with multiple parents Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 12/28] clk: tests: Add some tests for orphan " Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 13/28] clk: Take into account uncached clocks in clk_set_rate_range() Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 14/28] clk: Fix clk_get_parent() documentation Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 15/28] clk: Set req_rate on reparenting Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 16/28] clk: Change clk_core_init_rate_req prototype Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 17/28] clk: Move clk_core_init_rate_req() from clk_core_round_rate_nolock() to its caller Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 18/28] clk: Introduce clk_hw_init_rate_request() Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 19/28] clk: Add our request boundaries in clk_core_init_rate_req Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 20/28] clk: Switch from __clk_determine_rate to clk_core_round_rate_nolock Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 21/28] clk: Introduce clk_core_has_parent() Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 22/28] clk: Stop forwarding clk_rate_requests to the parent Maxime Ripard
2022-05-11 19:21   ` kernel test robot
2022-05-11 19:21   ` kernel test robot
2022-05-11 20:23   ` kernel test robot
2022-05-11 21:25   ` kernel test robot
2022-05-11 14:42 ` [PATCH v3 23/28] clk: Zero the clk_rate_request structure Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 24/28] clk: Test the clock pointer in clk_hw_get_name() Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 25/28] clk: Introduce the clk_hw_get_rate_range function Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 26/28] clk: qcom: clk-rcg2: Take clock boundaries into consideration for gfx3d Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 27/28] clk: tests: Add some tests for clk_get_rate_range() Maxime Ripard
2022-05-11 14:42 ` [PATCH v3 28/28] clk: tests: Add missing test case for ranges Maxime Ripard
2022-05-11 14:48 ` [PATCH v3 00/28] clk: More clock rate fixes and tests Maxime Ripard
2022-06-03 14:30   ` Maxime Ripard

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=20220511144249.354775-5-maxime@cerno.tech \
    --to=maxime@cerno.tech \
    --cc=alexander.stein@ew.tq-group.com \
    --cc=dmitry.baryshkov@linaro.org \
    --cc=jbrunet@baylibre.com \
    --cc=linux-clk@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=mturquette@baylibre.com \
    --cc=naresh.kamboju@linaro.org \
    --cc=narmstrong@baylibre.com \
    --cc=sboyd@kernel.org \
    --cc=tony@atomide.com \
    --cc=y.oudjana@protonmail.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