On Tue, 11 Oct 2022, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Have the state checker validate the ELD. For now we'll
> just dump it out as a hex buffer on a mismatch, maybe
> someone will get inspired to decode it properly at some
> point...
>
> Cc: Chaitanya Kumar Borah <chaitanya.kumar.borah@xxxxxxxxx>
> Cc: Kai Vehmanen <kai.vehmanen@xxxxxxxxxxxxxxx>
> Cc: Takashi Iwai <tiwai@xxxxxxx>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 43 ++++++++++++++++++++
> 1 file changed, 43 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index c52da2a21896..ef5087af9405 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -5419,6 +5419,12 @@ intel_compare_dp_vsc_sdp(const struct drm_dp_vsc_sdp *a,
> return memcmp(a, b, sizeof(*a)) == 0;
> }
>
> +static bool
> +intel_compare_buffer(const u8 *a, const u8 *b, size_t len)
> +{
> + return memcmp(a, b, len) == 0;
> +}
> +
> static void
> pipe_config_infoframe_mismatch(struct drm_i915_private *dev_priv,
> bool fastset, const char *name,
> @@ -5469,6 +5475,30 @@ pipe_config_dp_vsc_sdp_mismatch(struct drm_i915_private *dev_priv,
> }
> }
>
> +static void
> +pipe_config_buffer_mismatch(struct drm_i915_private *dev_priv,
> + bool fastset, const char *name,
> + const u8 *a, const u8 *b, size_t len)
> +{
> + if (fastset) {
> + if (!drm_debug_enabled(DRM_UT_KMS))
> + return;
> +
> + drm_dbg_kms(&dev_priv->drm,
> + "fastset mismatch in %s buffer\n", name);
> + print_hex_dump(KERN_DEBUG, "expected: ", DUMP_PREFIX_NONE,
> + 16, 0, a, len, false);
> + print_hex_dump(KERN_DEBUG, "found: ", DUMP_PREFIX_NONE,
> + 16, 0, b, len, false);
> + } else {
> + drm_err(&dev_priv->drm, "mismatch in %s buffer\n", name);
> + print_hex_dump(KERN_ERR, "expected: ", DUMP_PREFIX_NONE,
> + 16, 0, a, len, false);
> + print_hex_dump(KERN_ERR, "found: ", DUMP_PREFIX_NONE,
> + 16, 0, b, len, false);
> + }
> +}
> +
> static void __printf(4, 5)
> pipe_config_mismatch(bool fastset, const struct intel_crtc *crtc,
> const char *name, const char *format, ...)
> @@ -5701,6 +5731,18 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
> } \
> } 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)); \
> + if (!intel_compare_buffer(current_config->name, pipe_config->name, (len))) { \
> + pipe_config_buffer_mismatch(dev_priv, fastset, __stringify(name), \
> + current_config->name, \
> + pipe_config->name, \
> + (len)); \
> + ret = false; \
> + } \
> +} while (0)
> +
> #define PIPE_CONF_CHECK_COLOR_LUT(name1, name2, bit_precision) do { \
> if (current_config->name1 != pipe_config->name1) { \
> pipe_config_mismatch(fastset, crtc, __stringify(name1), \
> @@ -5779,6 +5821,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
> PIPE_CONF_CHECK_BOOL(fec_enable);
>
> PIPE_CONF_CHECK_BOOL_INCOMPLETE(has_audio);
> + PIPE_CONF_CHECK_BUFFER(eld, MAX_ELD_BYTES);
>
> PIPE_CONF_CHECK_X(gmch_pfit.control);
> /* pfit ratios are autocomputed by the hw on gen4+ */
--
Jani Nikula, Intel Open Source Graphics Center
