[PATCH 03/12] drm/i915: Include CRTC info in VSC SDP mismatch prints

[Rodrigo Vivi]

On Thu, Feb 15, 2024 at 06:40:46PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Most crtc state mismatches include the CRTC id+name in the
> prints. Also include it in the VSC SDP mismatches.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index e3520a3da468..2aabfa154d8a 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -4817,21 +4817,24 @@ pipe_config_infoframe_mismatch(bool fastset, const struct intel_crtc *crtc,
>  }
>  
>  static void
> -pipe_config_dp_vsc_sdp_mismatch(struct drm_i915_private *i915,
> -				bool fastset, const char *name,
> +pipe_config_dp_vsc_sdp_mismatch(bool fastset, const struct intel_crtc *crtc,
> +				const char *name,
>  				const struct drm_dp_vsc_sdp *a,
>  				const struct drm_dp_vsc_sdp *b)
>  {
> +	struct drm_i915_private *i915 = to_i915(crtc->base.dev);
>  	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);
> +		drm_printf(&p, "[CRTC:%d:%s] fastset requirement not met in %s dp sdp\n",
> +			   crtc->base.base.id, crtc->base.name, name);
>  	} else {
>  		p = drm_err_printer(&i915->drm, NULL);
>  
> -		drm_printf(&p, "mismatch in %s dp sdp\n", name);
> +		drm_printf(&p, "[CRTC:%d:%s] mismatch in %s dp sdp\n",
> +			   crtc->base.base.id, crtc->base.name, name);

ditto

>  	}
>  
>  	drm_printf(&p, "expected:\n");
> @@ -5086,7 +5089,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  #define PIPE_CONF_CHECK_DP_VSC_SDP(name) do { \
>  	if (!intel_compare_dp_vsc_sdp(&current_config->infoframes.name, \
>  				      &pipe_config->infoframes.name)) { \
> -		pipe_config_dp_vsc_sdp_mismatch(dev_priv, fastset, __stringify(name), \
> +		pipe_config_dp_vsc_sdp_mismatch(fastset, crtc, __stringify(name), \

ditto

anyway

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

>  						&current_config->infoframes.name, \
>  						&pipe_config->infoframes.name); \
>  		ret = false; \
> -- 
> 2.43.0
>