From: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
To: "Xaver Hugl" <xaver.hugl@gmail.com>,
"Vidith Madhu" <vmadhu@nvidia.com>,
"Borah, Chaitanya Kumar" <chaitanya.kumar.borah@intel.com>,
"Leo Li" <sunpeng.li@amd.com>,
"Harry Wentland" <harry.wentland@amd.com>,
"Fangzhi Zuo" <Jerry.Zuo@amd.com>,
"Daniel Stone" <daniels@collabora.com>,
"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>, "Helge Deller" <deller@gmx.de>,
"Andrzej Hajda" <andrzej.hajda@intel.com>,
"Neil Armstrong" <neil.armstrong@linaro.org>,
"Robert Foss" <rfoss@kernel.org>,
"Laurent Pinchart" <Laurent.pinchart@ideasonboard.com>,
"Jonas Karlman" <jonas@kwiboo.se>,
"Jernej Skrabec" <jernej.skrabec@gmail.com>,
"Luca Ceresoli" <luca.ceresoli@bootlin.com>,
"Sandy Huang" <hjc@rock-chips.com>,
"Heiko Stübner" <heiko@sntech.de>, "Andy Yan" <andyshrk@163.com>,
"Michel Dänzer" <michel.daenzer@mailbox.org>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
linux-fbdev@vger.kernel.org, linux-rockchip@lists.infradead.org,
linux-arm-kernel@lists.infradead.org, kernel@collabora.com,
Derek Foreman <derek.foreman@collabora.com>,
wayland-devel@lists.freedesktop.org,
Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
Subject: [PATCH v2 20/27] drm/connector: hdmi: Add QMS state validation and computation
Date: Thu, 05 Nov 2026 16:52:11 +0100 [thread overview]
Message-ID: <20261105-vrr-limiter-uapi-v2-20-55f4215be2c2@collabora.com> (raw)
In-Reply-To: <20261105-vrr-limiter-uapi-v2-0-55f4215be2c2@collabora.com>
Add the necessary code to the HDMI state helpers' hdmi_validate_vrr
function in order to check and derive the state necessary for HDMI Quick
Media Switching (QMS) support.
Co-developed-by: Derek Foreman <derek.foreman@collabora.com>
Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
---
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 112 +++++++++++++++++++++++-
1 file changed, 109 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/display/drm_hdmi_state_helper.c b/drivers/gpu/drm/display/drm_hdmi_state_helper.c
index 407ad28c649f..ba290eea7390 100644
--- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c
+++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c
@@ -2,6 +2,7 @@
#include <linux/debugfs.h>
#include <linux/export.h>
+#include <linux/gcd.h>
#include <drm/drm_atomic.h>
#include <drm/drm_connector.h>
@@ -954,6 +955,26 @@ hdmi_generate_infoframes(const struct drm_connector *connector,
return 0;
}
+static const struct {
+ u8 tfr_byte;
+ u32 rate_n;
+ u32 rate_d;
+} hdmi_qms_tfrs[] = {
+ { 1, 24000, 1001 },
+ { 2, 24, 1 },
+ { 3, 25, 1 },
+ { 4, 30000, 1001 },
+ { 5, 30, 1 },
+ { 6, 48000, 1001 },
+ { 7, 48, 1 },
+ { 8, 50, 1 },
+ { 9, 60000, 1001 },
+ { 10, 60, 1 },
+ { 11, 100, 1 },
+ { 12, 120000, 1001 },
+ { 13, 120, 1 },
+};
+
/**
* cmp_fraction - compares two fractional numbers
* @a: numerator of the first fraction
@@ -992,6 +1013,66 @@ static int cmp_fraction(u32 a, u32 b, u32 c, u32 d)
return 0;
}
+/**
+ * hdmi_validate_qms - Validate HDMI QMS state
+ * @crtc_state: pointer to a &struct drm_crtc_state to run validation on
+ * @info: pointer to a &struct drm_display_info of the accompanying connector
+ *
+ * Validate that the drm_crtc_vrr_state.vrr_min_numerator and
+ * drm_crtc_vrr_state.vrr_min_denominator are acceptable for HDMI QMS, and check
+ * that the display is HDMI QMS capable.
+ *
+ * Returns:
+ * - Negative errno on failure
+ * - the corresponding QMS signaling byte for the target frame rate otherwise
+ */
+static int hdmi_validate_qms(struct drm_crtc_state *crtc_state,
+ struct drm_connector_state *conn_state,
+ const struct drm_display_info *info)
+{
+ u32 rate_n = crtc_state->vrr_state.vrr_min_n;
+ u32 rate_d = crtc_state->vrr_state.vrr_min_d;
+ u32 min_rate_n, max_rate;
+ u32 g, i;
+
+ if (conn_state->vrr_display_mode != VRR_DISPLAY_MODE_MEDIA)
+ return 0;
+
+ if (!drm_crtc_helper_vrr_is_fixed_rate(&crtc_state->vrr_state))
+ return -EINVAL;
+
+ if (info->hdmi.vrr_cap.qms_tfr_min)
+ min_rate_n = 24000;
+ else
+ min_rate_n = info->hdmi.vrr_cap.vrr_min * 1000;
+
+ if (info->hdmi.vrr_cap.qms_tfr_max)
+ max_rate = info->hdmi.vrr_cap.vrr_max;
+ else
+ max_rate = 60;
+
+ g = gcd(rate_n, rate_d);
+ if (g != 1) {
+ rate_n /= g;
+ rate_d /= g;
+ }
+
+ if (!rate_d)
+ return -EINVAL;
+
+ for (i = 0; i < ARRAY_SIZE(hdmi_qms_tfrs); i++) {
+ if (cmp_fraction(min_rate_n, 1001, hdmi_qms_tfrs[i].rate_n,
+ hdmi_qms_tfrs[i].rate_d) > 0)
+ continue;
+ if (rate_n == hdmi_qms_tfrs[i].rate_n &&
+ rate_d == hdmi_qms_tfrs[i].rate_d &&
+ cmp_fraction(rate_n, rate_d, max_rate, 1) <= 0)
+ return hdmi_qms_tfrs[i].tfr_byte;
+ }
+
+ return -EINVAL;
+}
+
static int hdmi_calculate_vtotal(const struct drm_display_mode *mode,
u32 rate_n, u32 rate_d, u16 *out_vtotal,
u32 *out_denom, u32 *out_frame_err)
@@ -1129,8 +1210,17 @@ static int hdmi_validate_vrr(struct drm_connector *connector,
if (old_conn_state)
old_crtc_state = drm_atomic_get_old_crtc_state(state, old_conn_state->crtc);
- if (!info->hdmi.vrr_cap.supported)
- return -EOPNOTSUPP;
+ switch (new_conn_state->vrr_display_mode) {
+ case VRR_DISPLAY_MODE_GAME:
+ if (!info->hdmi.vrr_cap.supported)
+ return -EOPNOTSUPP;
+ break;
+ case VRR_DISPLAY_MODE_MEDIA:
+ if (!info->hdmi.vrr_cap.qms_capable ||
+ !connector->hdmi.qms_supported)
+ return -EOPNOTSUPP;
+ break;
+ }
mode_refresh = drm_mode_vrefresh(mode);
@@ -1145,7 +1235,10 @@ static int hdmi_validate_vrr(struct drm_connector *connector,
max_vfreq_n = mode_refresh;
is_fixed = drm_crtc_helper_vrr_is_fixed_rate(vrr_state);
- if (is_fixed && info->hdmi.vrr_cap.cinema_vrr)
+ if (is_fixed && ((info->hdmi.vrr_cap.qms_tfr_min &&
+ new_conn_state->vrr_display_mode == VRR_DISPLAY_MODE_MEDIA &&
+ connector->hdmi.qms_supported && info->hdmi.vrr_cap.qms_capable) ||
+ info->hdmi.vrr_cap.cinema_vrr))
min_vfreq_n = 24;
/* If the VRR target changed, make sure to reset the error accumulator */
@@ -1176,6 +1269,19 @@ static int hdmi_validate_vrr(struct drm_connector *connector,
return ret;
}
+ ret = hdmi_validate_qms(new_crtc_state, new_conn_state, info);
+ if (ret < 0) {
+ drm_dbg_kms(dev, "Invalid QMS rate: %pe\n", ERR_PTR(ret));
+ return ret;
+ }
+
+ new_conn_state->hdmi.qms_tfr_byte = ret;
+ if (!old_conn_state ||
+ new_conn_state->hdmi.qms_tfr_byte != old_conn_state->hdmi.qms_tfr_byte)
+ vrr_state->dynamic = true;
+ else
+ vrr_state->dynamic = false;
+
if (!is_fixed) {
vrr_state->dynamic = true;
--
2.56.0
next prev parent reply other threads:[~2026-11-05 15:56 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-05 15:51 [PATCH v2 00/27] VRR Target Rate Limiter KMS uAPI and Implementation Nicolas Frattaroli
2026-11-05 15:51 ` [PATCH v2 01/27] drm: Add VRR state Nicolas Frattaroli
2026-11-05 15:51 ` [PATCH v2 02/27] drm/connector: add vrr_display_mode connector property Nicolas Frattaroli
2026-11-05 15:51 ` [PATCH v2 03/27] video/hdmi: Add VTEM EMP packing Nicolas Frattaroli
2026-11-05 15:51 ` [PATCH v2 04/27] drm/bridge: Add VTEM EMP support Nicolas Frattaroli
2026-11-05 15:51 ` [PATCH v2 05/27] drm/connector: hdmi: Add VTEM EMP generation Nicolas Frattaroli
2026-11-05 15:51 ` [PATCH v2 06/27] drm/crtc-helper: Add VRR helper functions Nicolas Frattaroli
2026-11-05 15:51 ` [PATCH v2 07/27] drm/bridge: synopsys: Add VTEM EMP support Nicolas Frattaroli
2026-11-05 15:51 ` [PATCH v2 08/27] drm/connector: Add drm_display_info_is_vrr_capable Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 09/27] drm: Add VRR target frame rate properties Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 10/27] drm/connector: Add vrr_display_{min,max} connector properties Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 11/27] drm: Implement VRR rate limiting Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 12/27] drm/rockchip: dw_hdmi_qp: Add VRR support Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 13/27] drm/rockchip: Set mode_changed on vrr_enabled change Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 14/27] drm/rockchip: vop2: Enable VRR Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 15/27] drm/edid: Parse QMS flag from HDMI SCDS Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 16/27] drm/edid: Parse QMS TFR min/max flags " Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 17/27] drm/connector: Add "Media" VRR display mode for QMS Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 18/27] video/hdmi: Add support for QMS in VTEM EMP packing Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 19/27] drm/connector: hdmi: Add QMS to VTEM EMP generation Nicolas Frattaroli
2026-11-05 15:52 ` Nicolas Frattaroli [this message]
2026-11-05 15:52 ` [PATCH v2 21/27] drm/rockchip: dw_hdmi_qp: Add QMS support Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 22/27] drm/tests: hdmi: Add "Game Mode" VRR tests Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 23/27] drm/tests: hdmi: Add Fixed/Constrained rate " Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 24/27] drm/tests: hdmi: Add Quick Media Switching tests Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 25/27] drm/connector: Fix docs for cnmvrr and cinemavrr members Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 26/27] drm/debugfs: Expose HDMI VRR in vrr_range debugfs Nicolas Frattaroli
2026-11-05 15:52 ` [PATCH v2 27/27] drm/tests: hdmi: Add tests for vrr_display_{min,max} properties Nicolas Frattaroli
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=20261105-vrr-limiter-uapi-v2-20-55f4215be2c2@collabora.com \
--to=nicolas.frattaroli@collabora.com \
--cc=Jerry.Zuo@amd.com \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=airlied@gmail.com \
--cc=andrzej.hajda@intel.com \
--cc=andyshrk@163.com \
--cc=chaitanya.kumar.borah@intel.com \
--cc=daniels@collabora.com \
--cc=deller@gmx.de \
--cc=derek.foreman@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=jernej.skrabec@gmail.com \
--cc=jonas@kwiboo.se \
--cc=kernel@collabora.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=luca.ceresoli@bootlin.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=michel.daenzer@mailbox.org \
--cc=mripard@kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=rfoss@kernel.org \
--cc=simona@ffwll.ch \
--cc=sunpeng.li@amd.com \
--cc=tzimmermann@suse.de \
--cc=vmadhu@nvidia.com \
--cc=wayland-devel@lists.freedesktop.org \
--cc=xaver.hugl@gmail.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
all inboxes | Powered by JetHome®