dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime@cerno.tech>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	Maxime Ripard <maxime@cerno.tech>,
	Daniel Vetter <daniel.vetter@intel.com>,
	David Airlie <airlied@linux.ie>
Cc: Dom Cobley <dom@raspberrypi.com>,
	Tim Gover <tim.gover@raspberrypi.com>,
	Dave Stevenson <dave.stevenson@raspberrypi.com>,
	dri-devel@lists.freedesktop.org,
	Werner Sembach <wse@tuxedocomputers.com>,
	Phil Elwell <phil@raspberrypi.com>
Subject: [PATCH v4 13/16] drm/vc4: hdmi: Take the sink maximum TMDS clock into account
Date: Thu, 20 Jan 2022 16:16:22 +0100	[thread overview]
Message-ID: <20220120151625.594595-14-maxime@cerno.tech> (raw)
In-Reply-To: <20220120151625.594595-1-maxime@cerno.tech>

In the function that validates that the clock isn't too high, we've only
taken our controller limitations into account so far.

However, the sink can have a limit on the maximum TMDS clock it can deal
with too which is exposed through the EDID and the drm_display_info.

Make sure we check it.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
 drivers/gpu/drm/vc4/vc4_hdmi.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 764f3c5cfa54..b68d3626d1a3 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -1266,12 +1266,18 @@ static enum drm_mode_status
 vc4_hdmi_encoder_clock_valid(const struct vc4_hdmi *vc4_hdmi,
 			     unsigned long long clock)
 {
+	const struct drm_connector *connector = &vc4_hdmi->connector;
+	const struct drm_display_info *info = &connector->display_info;
+
 	if (clock > vc4_hdmi->variant->max_pixel_clock)
 		return MODE_CLOCK_HIGH;
 
 	if (vc4_hdmi->disable_4kp60 && clock > HDMI_14_MAX_TMDS_CLK)
 		return MODE_CLOCK_HIGH;
 
+	if (info->max_tmds_clock && clock > (info->max_tmds_clock * 1000))
+		return MODE_CLOCK_HIGH;
+
 	return MODE_OK;
 }
 
-- 
2.34.1


  parent reply	other threads:[~2022-01-20 15:17 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-20 15:16 [PATCH v4 00/16] drm/vc4: hdmi: Yet Another Approach to HDMI YUV output Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 01/16] drm/edid: Rename drm_hdmi_avi_infoframe_colorspace to _colorimetry Maxime Ripard
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 02/16] drm/edid: Don't clear formats if using deep color Maxime Ripard
2022-01-24  9:00   ` Ville Syrjälä
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 03/16] drm/edid: Split deep color modes between RGB and YUV444 Maxime Ripard
2022-01-24  9:01   ` Ville Syrjälä
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 04/16] drm/connector: Fix typo in output format Maxime Ripard
2022-01-24  9:04   ` Ville Syrjälä
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 05/16] drm/vc4: hdmi: Add full range RGB helper Maxime Ripard
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 06/16] drm/vc4: hdmi: Use full range helper in csc functions Maxime Ripard
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 07/16] drm/vc4: hdmi: Move XBAR setup to csc_setup Maxime Ripard
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 08/16] drm/vc4: hdmi: Replace CSC_CTL hardcoded value by defines Maxime Ripard
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 09/16] drm/vc4: hdmi: Define colorspace matrices Maxime Ripard
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 10/16] drm/vc4: hdmi: Change CSC callback prototype Maxime Ripard
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 11/16] drm/vc4: hdmi: Move clock validation to its own function Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 12/16] drm/vc4: hdmi: Move clock calculation into " Maxime Ripard
2022-01-20 15:16 ` Maxime Ripard [this message]
2022-01-20 15:16 ` [PATCH v4 14/16] drm/vc4: hdmi: Take bpp into account for the scrambler Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 15/16] drm/vc4: hdmi: Always try to have the highest bpc Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 16/16] drm/vc4: hdmi: Support HDMI YUV output 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=20220120151625.594595-14-maxime@cerno.tech \
    --to=maxime@cerno.tech \
    --cc=airlied@linux.ie \
    --cc=daniel.vetter@intel.com \
    --cc=dave.stevenson@raspberrypi.com \
    --cc=dom@raspberrypi.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=phil@raspberrypi.com \
    --cc=tim.gover@raspberrypi.com \
    --cc=tzimmermann@suse.de \
    --cc=wse@tuxedocomputers.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