Merge tag 'drm-intel-next-2024-02-27-1' of git://anongit.freedesktop.org/drm/drm...

[thirdparty/linux.git] / drivers / gpu / drm / i915 / display / intel_display.c

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 97655a3b6d6818ccd9f00a0aace70c3b3323b5b1..ab2f52d21bad8bad22c184cce6aefac8b0ce5a29 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -4823,28 +4823,27 @@ pipe_config_infoframe_mismatch(struct drm_i915_private *dev_priv,
 }
 
 static void
-pipe_config_dp_vsc_sdp_mismatch(struct drm_i915_private *dev_priv,
+pipe_config_dp_vsc_sdp_mismatch(struct drm_i915_private *i915,
                                bool fastset, const char *name,
                                const struct drm_dp_vsc_sdp *a,
                                const struct drm_dp_vsc_sdp *b)
 {
+       struct drm_printer p;
+
        if (fastset) {
-               if (!drm_debug_enabled(DRM_UT_KMS))
-                       return;
+               p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL);
 
-               drm_dbg_kms(&dev_priv->drm,
-                           "fastset requirement not met in %s dp sdp\n", name);
-               drm_dbg_kms(&dev_priv->drm, "expected:\n");
-               drm_dp_vsc_sdp_log(KERN_DEBUG, dev_priv->drm.dev, a);
-               drm_dbg_kms(&dev_priv->drm, "found:\n");
-               drm_dp_vsc_sdp_log(KERN_DEBUG, dev_priv->drm.dev, b);
+               drm_printf(&p, "fastset requirement not met in %s dp sdp\n", name);
        } else {
-               drm_err(&dev_priv->drm, "mismatch in %s dp sdp\n", name);
-               drm_err(&dev_priv->drm, "expected:\n");
-               drm_dp_vsc_sdp_log(KERN_ERR, dev_priv->drm.dev, a);
-               drm_err(&dev_priv->drm, "found:\n");
-               drm_dp_vsc_sdp_log(KERN_ERR, dev_priv->drm.dev, b);
+               p = drm_err_printer(&i915->drm, NULL);
+
+               drm_printf(&p, "mismatch in %s dp sdp\n", name);
        }
+
+       drm_printf(&p, "expected:\n");
+       drm_dp_vsc_sdp_log(&p, a);
+       drm_printf(&p, "found:\n");
+       drm_dp_vsc_sdp_log(&p, b);
 }
 
 /* Returns the length up to and including the last differing byte */