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 <[email protected]>
Signed-off-by: Derek Foreman <[email protected]>
Signed-off-by: Nicolas Frattaroli <[email protected]>
---
 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

Reply via email to