On Thu, 15 Feb 2024, Ville Syrjala <ville.syrj...@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrj...@linux.intel.com>
>
> Hoist pipe_config_mismatch() upwards a bit so that it can get
> reused by the other mismatch() functions.
>
> Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nik...@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 46 ++++++++++----------
> 1 file changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index d7f39ad84138..a9dd3632898c 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -4787,6 +4787,29 @@ intel_compare_buffer(const u8 *a, const u8 *b, size_t
> len)
> return memcmp(a, b, len) == 0;
> }
>
> +static void __printf(4, 5)
> +pipe_config_mismatch(bool fastset, const struct intel_crtc *crtc,
> + const char *name, const char *format, ...)
> +{
> + struct drm_i915_private *i915 = to_i915(crtc->base.dev);
> + struct va_format vaf;
> + va_list args;
> +
> + va_start(args, format);
> + vaf.fmt = format;
> + vaf.va = &args;
> +
> + if (fastset)
> + drm_dbg_kms(&i915->drm,
> + "[CRTC:%d:%s] fastset requirement not met in %s
> %pV\n",
> + crtc->base.base.id, crtc->base.name, name, &vaf);
> + else
> + drm_err(&i915->drm, "[CRTC:%d:%s] mismatch in %s %pV\n",
> + crtc->base.base.id, crtc->base.name, name, &vaf);
> +
> + va_end(args);
> +}
> +
> static void
> pipe_config_infoframe_mismatch(bool fastset, const struct intel_crtc *crtc,
> const char *name,
> @@ -4896,29 +4919,6 @@ pipe_config_buffer_mismatch(bool fastset, const struct
> intel_crtc *crtc,
> 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, ...)
> -{
> - struct drm_i915_private *i915 = to_i915(crtc->base.dev);
> - struct va_format vaf;
> - va_list args;
> -
> - va_start(args, format);
> - vaf.fmt = format;
> - vaf.va = &args;
> -
> - if (fastset)
> - drm_dbg_kms(&i915->drm,
> - "[CRTC:%d:%s] fastset requirement not met in %s
> %pV\n",
> - crtc->base.base.id, crtc->base.name, name, &vaf);
> - else
> - drm_err(&i915->drm, "[CRTC:%d:%s] mismatch in %s %pV\n",
> - crtc->base.base.id, crtc->base.name, name, &vaf);
> -
> - va_end(args);
> -}
> -
> static void
> pipe_config_pll_mismatch(bool fastset,
> const struct intel_crtc *crtc,
--
Jani Nikula, Intel
