From: Maxime Ripard <maxime@cerno.tech>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Maxime Ripard <maxime@cerno.tech>,
Mike Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
linux-clk@vger.kernel.org, dri-devel@lists.freedesktop.org
Cc: Phil Elwell <phil@raspberrypi.com>,
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
Tim Gover <tim.gover@raspberrypi.com>,
bcm-kernel-feedback-list@broadcom.com,
linux-rpi-kernel@lists.infradead.org,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>
Subject: [PATCH 4/8] drm/vc4: hdmi: Check and warn if we can't reach 4kp60 frequencies
Date: Thu, 25 Feb 2021 16:59:05 +0100 [thread overview]
Message-ID: <20210225155909.1853812-5-maxime@cerno.tech> (raw)
In-Reply-To: <20210225155909.1853812-1-maxime@cerno.tech>
In order to reach the frequencies needed to output at 594MHz, the
firmware needs to be configured with the appropriate parameters in the
config.txt file (enable_hdmi_4kp60 and force_turbo).
Let's detect it at bind time, warn the user if we can't, and filter out
the relevant modes.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/gpu/drm/vc4/vc4_hdmi.c | 17 +++++++++++++++++
drivers/gpu/drm/vc4/vc4_hdmi.h | 8 ++++++++
2 files changed, 25 insertions(+)
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index b5bc742993a4..f05f6da286f7 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -953,6 +953,9 @@ static int vc4_hdmi_encoder_atomic_check(struct drm_encoder *encoder,
if (pixel_rate > vc4_hdmi->variant->max_pixel_clock)
return -EINVAL;
+ if (vc4_hdmi->disable_4kp60 && (pixel_rate > HDMI_14_MAX_TMDS_CLK))
+ return -EINVAL;
+
vc4_state->pixel_rate = pixel_rate;
return 0;
@@ -972,6 +975,9 @@ vc4_hdmi_encoder_mode_valid(struct drm_encoder *encoder,
if ((mode->clock * 1000) > vc4_hdmi->variant->max_pixel_clock)
return MODE_CLOCK_HIGH;
+ if (vc4_hdmi->disable_4kp60 && ((mode->clock * 1000) > HDMI_14_MAX_TMDS_CLK))
+ return MODE_CLOCK_HIGH;
+
return MODE_OK;
}
@@ -1986,6 +1992,17 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
vc4_hdmi->disable_wifi_frequencies =
of_property_read_bool(dev->of_node, "wifi-2.4ghz-coexistence");
+ if (variant->max_pixel_clock == 600000000) {
+ struct vc4_dev *vc4 = to_vc4_dev(drm);
+ long max_rate = clk_get_max_rate(vc4->hvs->core_clk);
+
+ if (max_rate < 550000000) {
+ drm_warn(drm, "The core clock cannot reach frequencies high enough to support 4k @ 60Hz.");
+ drm_warn(drm, "Please change your config.txt file to add hdmi_enable_4kp60 and force_turbo");
+ vc4_hdmi->disable_4kp60 = true;
+ }
+ }
+
if (vc4_hdmi->variant->reset)
vc4_hdmi->variant->reset(vc4_hdmi);
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
index 3cebd1fd00fc..3cd021136402 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
@@ -154,6 +154,14 @@ struct vc4_hdmi {
*/
bool disable_wifi_frequencies;
+ /*
+ * Even if HDMI0 on the RPi4 can output modes requiring a pixel
+ * rate higher than 297MHz, it needs some adjustments in the
+ * config.txt file to be able to do so and thus won't always be
+ * available.
+ */
+ bool disable_4kp60;
+
struct cec_adapter *cec_adap;
struct cec_msg cec_rx_msg;
bool cec_tx_ok;
--
2.29.2
next prev parent reply other threads:[~2021-02-25 16:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-25 15:59 [PATCH 0/8] drm/vc4: hdmi: Support the 4k @ 60Hz modes Maxime Ripard
2021-02-25 15:59 ` [PATCH 1/8] clk: Add range accessors Maxime Ripard
2021-03-02 23:18 ` Stephen Boyd
2021-03-03 8:45 ` Maxime Ripard
2021-03-17 1:06 ` Stephen Boyd
2021-03-17 13:04 ` Maxime Ripard
2021-02-25 15:59 ` [PATCH 2/8] drm/vc4: hvs: Make the HVS bind first Maxime Ripard
2021-02-25 16:51 ` Dave Stevenson
2021-02-25 15:59 ` [PATCH 3/8] drm/vc4: hdmi: Properly compute the BVB clock rate Maxime Ripard
2021-02-25 16:44 ` Dave Stevenson
2021-02-25 17:15 ` Dave Stevenson
2021-02-25 15:59 ` Maxime Ripard [this message]
2021-02-25 16:38 ` [PATCH 4/8] drm/vc4: hdmi: Check and warn if we can't reach 4kp60 frequencies Dave Stevenson
2021-03-02 13:01 ` Maxime Ripard
2021-03-02 15:10 ` Dave Stevenson
2021-02-25 15:59 ` [PATCH 5/8] drm/vc4: hdmi: Enable the scrambler Maxime Ripard
2021-02-25 16:33 ` Dave Stevenson
2021-02-25 15:59 ` [PATCH 6/8] drm/vc4: hdmi: Raise the maximum clock rate Maxime Ripard
2021-02-25 16:45 ` Dave Stevenson
2021-02-25 15:59 ` [PATCH 7/8] drm/vc4: plane: Fix typo in scaler width and height Maxime Ripard
2021-02-25 16:50 ` Dave Stevenson
2021-02-25 15:59 ` [PATCH 8/8] drm/vc4: plane: Remove redundant assignment Maxime Ripard
2021-02-25 16:46 ` Dave Stevenson
2021-03-02 13:57 ` 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=20210225155909.1853812-5-maxime@cerno.tech \
--to=maxime@cerno.tech \
--cc=airlied@linux.ie \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=daniel.vetter@intel.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mturquette@baylibre.com \
--cc=nsaenzjulienne@suse.de \
--cc=phil@raspberrypi.com \
--cc=sboyd@kernel.org \
--cc=tim.gover@raspberrypi.com \
--cc=tzimmermann@suse.de \
/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