drm/i915: Convert pipe_config_infoframe_mismatch() to drm_printer

Utilize drm_printer in pipe_config_infoframe_mismatch() to avoid
a bit of code duplication.

hdmi_infoframe_log() can't use the printer of course, but for that
we can just figure out which loglevel to use. And we do need to keep
the explicit drm_debug_enabled(DRM_UT_KMS) since hdmi_infoframe_log()
won't do it for us.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240215164055.30585-5-ville.syrjala@linux.intel.com
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 621906953232389c59f0bc85ecc2946ea46dd628..6e3eec60d1dfa1969e3361514bcde887991a1ee1 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -4803,27 +4803,31 @@ pipe_config_infoframe_mismatch(bool fastset, const struct intel_crtc *crtc,
                               const union hdmi_infoframe *a,
                               const union hdmi_infoframe *b)
 {
-       struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
+       struct drm_i915_private *i915 = to_i915(crtc->base.dev);
+       struct drm_printer p;
+       const char *loglevel;
 
        if (fastset) {
                if (!drm_debug_enabled(DRM_UT_KMS))
                        return;
 
-               drm_dbg_kms(&dev_priv->drm,
-                           "[CRTC:%d:%s] fastset requirement not met in %s infoframe\n",
-                           crtc->base.base.id, crtc->base.name, name);
-               drm_dbg_kms(&dev_priv->drm, "expected:\n");
-               hdmi_infoframe_log(KERN_DEBUG, dev_priv->drm.dev, a);
-               drm_dbg_kms(&dev_priv->drm, "found:\n");
-               hdmi_infoframe_log(KERN_DEBUG, dev_priv->drm.dev, b);
+               p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL);
+               loglevel = KERN_DEBUG;
+
+               drm_printf(&p, "[CRTC:%d:%s] fastset requirement not met in %s infoframe\n",
+                          crtc->base.base.id, crtc->base.name, name);
        } else {
-               drm_err(&dev_priv->drm, "[CRTC:%d:%s] mismatch in %s infoframe\n",
-                       crtc->base.base.id, crtc->base.name, name);
-               drm_err(&dev_priv->drm, "expected:\n");
-               hdmi_infoframe_log(KERN_ERR, dev_priv->drm.dev, a);
-               drm_err(&dev_priv->drm, "found:\n");
-               hdmi_infoframe_log(KERN_ERR, dev_priv->drm.dev, b);
+               p = drm_err_printer(&i915->drm, NULL);
+               loglevel = KERN_ERR;
+
+               drm_printf(&p, "[CRTC:%d:%s] mismatch in %s infoframe\n",
+                          crtc->base.base.id, crtc->base.name, name);
        }
+
+       drm_printf(&p, "expected:\n");
+       hdmi_infoframe_log(loglevel, i915->drm.dev, a);
+       drm_printf(&p, "found:\n");
+       hdmi_infoframe_log(loglevel, i915->drm.dev, b);
 }
 
 static void