Re: [PATCH v12 6/8] drm/i915/display: Add state checker for Adaptive Sync SDP

[Nautiyal, Ankit K]

On 2/28/2024 8:08 PM, Mitul Golani wrote:

Enable infoframe and add state checker for Adaptive Sync
SDP enablement.

Signed-off-by: Mitul Golani <mitulkumar.ajitkumar.gol...@intel.com>
---
  drivers/gpu/drm/i915/display/intel_display.c | 46 ++++++++++++++++++++
  drivers/gpu/drm/i915/display/intel_dp.c      |  2 +
  2 files changed, 48 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 00ac65a14029..be0a5fae4e58 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -4781,6 +4781,17 @@ intel_compare_dp_vsc_sdp(const struct drm_dp_vsc_sdp *a,
                a->content_type == b->content_type;
  }

+static bool

+intel_compare_dp_as_sdp(const struct drm_dp_as_sdp *a,
+                       const struct drm_dp_as_sdp *b)
+{
+       return a->vtotal == b->vtotal &&
+               a->target_rr == b->target_rr &&
+               a->duration_incr_ms == b->duration_incr_ms &&
+               a->duration_decr_ms == b->duration_decr_ms &&
+               a->mode == b->mode;
+}
+
  static bool
  intel_compare_buffer(const u8 *a, const u8 *b, size_t len)
  {
@@ -4836,6 +4847,30 @@ pipe_config_dp_vsc_sdp_mismatch(struct drm_i915_private 
*i915,
        drm_dp_vsc_sdp_log(&p, b);
  }

+static void

+pipe_config_dp_as_sdp_mismatch(struct drm_i915_private *i915,
+                              bool fastset, const char *name,
+                              const struct drm_dp_as_sdp *a,
+                              const struct drm_dp_as_sdp *b)
+{
+       struct drm_printer p;
+
+       if (fastset) {
+               p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL);
+
+               drm_printf(&p, "fastset requirement not met in %s dp sdp\n", 
name);
+       } else {
+               p = drm_err_printer(&i915->drm, NULL);
+
+               drm_printf(&p, "mismatch in %s dp sdp\n", name);
+       }
+
+       drm_printf(&p, "expected:\n");
+       drm_dp_as_sdp_log(&p, a);
+       drm_printf(&p, "found:\n");
+       drm_dp_as_sdp_log(&p, b);
+}
+
  /* Returns the length up to and including the last differing byte */
  static size_t
  memcmp_diff_len(const u8 *a, const u8 *b, size_t len)
@@ -5089,6 +5124,16 @@ intel_pipe_config_compare(const struct intel_crtc_state 
*current_config,
        } \
  } while (0)

+#define PIPE_CONF_CHECK_DP_AS_SDP(name) do { \

+       if (!intel_compare_dp_as_sdp(&current_config->infoframes.name, \
+                                     &pipe_config->infoframes.name)) { \
+               pipe_config_dp_as_sdp_mismatch(dev_priv, fastset, 
__stringify(name), \
+                                               
&current_config->infoframes.name, \
+                                               &pipe_config->infoframes.name); 
\
+               ret = false; \
+       } \
+} while (0)
+
  #define PIPE_CONF_CHECK_BUFFER(name, len) do { \
        BUILD_BUG_ON(sizeof(current_config->name) != (len)); \
        BUILD_BUG_ON(sizeof(pipe_config->name) != (len)); \
@@ -5270,6 +5315,7 @@ intel_pipe_config_compare(const struct intel_crtc_state 
*current_config,
        PIPE_CONF_CHECK_INFOFRAME(hdmi);
        PIPE_CONF_CHECK_INFOFRAME(drm);
        PIPE_CONF_CHECK_DP_VSC_SDP(vsc);
+       PIPE_CONF_CHECK_DP_AS_SDP(as_sdp);

PIPE_CONF_CHECK_X(sync_mode_slaves_mask);

        PIPE_CONF_CHECK_I(master_transcoder);
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c 
b/drivers/gpu/drm/i915/display/intel_dp.c
index 1cd3cc0d0c0b..2ec1f923a5a0 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -2648,6 +2648,8 @@ static void intel_dp_compute_as_sdp(struct intel_dp 
*intel_dp,
        as_sdp->target_rr = 0;
        as_sdp->duration_incr_ms = 0;
        as_sdp->duration_incr_ms = 0;
+
+       crtc_state->infoframes.enable |= 
intel_hdmi_infoframe_enable(DP_SDP_ADAPTIVE_SYNC);

This change does not seem to belong to this patch.

Regards,

Ankit

  }

static void intel_dp_compute_vsc_sdp(struct intel_dp *intel_dp,