| Message ID | 20240301084503.2971826-8-mitulkumar.ajitkumar.golani@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Enable Adaptive Sync SDP Support for DP | expand |
On 3/1/2024 2:15 PM, Mitul Golani wrote: > Enable infoframe and add state checker for Adaptive Sync > SDP enablement. > > --v1: > - crtc_state->infoframes.enable, to add on correct place holder. > > Signed-off-by: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com> LGTM. Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 46 ++++++++++++++++++++ > 1 file changed, 46 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index ab2f52d21bad..88158f06bf82 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -4791,6 +4791,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) > { > @@ -4846,6 +4857,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) > @@ -5099,6 +5134,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(¤t_config->infoframes.name, \ > + &pipe_config->infoframes.name)) { \ > + pipe_config_dp_as_sdp_mismatch(dev_priv, fastset, __stringify(name), \ > + ¤t_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)); \ > @@ -5280,6 +5325,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_display.c b/drivers/gpu/drm/i915/display/intel_display.c index ab2f52d21bad..88158f06bf82 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -4791,6 +4791,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) { @@ -4846,6 +4857,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) @@ -5099,6 +5134,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(¤t_config->infoframes.name, \ + &pipe_config->infoframes.name)) { \ + pipe_config_dp_as_sdp_mismatch(dev_priv, fastset, __stringify(name), \ + ¤t_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)); \ @@ -5280,6 +5325,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);
Enable infoframe and add state checker for Adaptive Sync SDP enablement. --v1: - crtc_state->infoframes.enable, to add on correct place holder. Signed-off-by: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 46 ++++++++++++++++++++ 1 file changed, 46 insertions(+)