Merge airlied/drm-next into drm-misc-next

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

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 331084082545cfb5fbc4351067148f490a66b512..3b48fd2561feccc48b5e0c549ee68e5d25214555 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11059,24 +11059,17 @@ intel_compare_link_m_n(const struct intel_link_m_n *m_n,
 static void __printf(3, 4)
 pipe_config_err(bool adjust, const char *name, const char *format, ...)
 {
-       char *level;
-       unsigned int category;
        struct va_format vaf;
        va_list args;
 
-       if (adjust) {
-               level = KERN_DEBUG;
-               category = DRM_UT_KMS;
-       } else {
-               level = KERN_ERR;
-               category = DRM_UT_NONE;
-       }
-
        va_start(args, format);
        vaf.fmt = format;
        vaf.va = &args;
 
-       drm_printk(level, category, "mismatch in %s %pV", name, &vaf);
+       if (adjust)
+               drm_dbg(DRM_UT_KMS, "mismatch in %s %pV", name, &vaf);
+       else
+               drm_err("mismatch in %s %pV", name, &vaf);
 
        va_end(args);
 }