1 files changed, 49 insertions, 16 deletions

diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
index 781518fd88e3..b25f98f33f6c 100644
--- a/drivers/gpu/drm/drm_print.c
+++ b/drivers/gpu/drm/drm_print.c
@@ -63,16 +63,34 @@ void drm_printf(struct drm_printer *p, const char *f, ...)
 }
 EXPORT_SYMBOL(drm_printf);
 
-#define DRM_PRINTK_FMT "[" DRM_NAME ":%s]%s %pV"
-
 void drm_dev_printk(const struct device *dev, const char *level,
-                    unsigned int category, const char *function_name,
-                    const char *prefix, const char *format, ...)
+                    const char *format, ...)
 {
         struct va_format vaf;
         va_list args;
 
-        if (category != DRM_UT_NONE && !(drm_debug & category))
+        va_start(args, format);
+        vaf.fmt = format;
+        vaf.va = &args;
+
+        if (dev)
+                dev_printk(level, dev, "[" DRM_NAME ":%ps] %pV",
+                           __builtin_return_address(0), &vaf);
+        else
+                printk("%s" "[" DRM_NAME ":%ps] %pV",
+                       level, __builtin_return_address(0), &vaf);
+
+        va_end(args);
+}
+EXPORT_SYMBOL(drm_dev_printk);
+
+void drm_dev_dbg(const struct device *dev, unsigned int category,
+                 const char *format, ...)
+{
+        struct va_format vaf;
+        va_list args;
+
+        if (!(drm_debug & category))
                 return;
 
         va_start(args, format);
@@ -80,32 +98,47 @@ void drm_dev_printk(const struct device *dev, const char *level,
         vaf.va = &args;
 
         if (dev)
-                dev_printk(level, dev, DRM_PRINTK_FMT, function_name, prefix,
-                           &vaf);
+                dev_printk(KERN_DEBUG, dev, "[" DRM_NAME ":%ps] %pV",
+                           __builtin_return_address(0), &vaf);
         else
-                printk("%s" DRM_PRINTK_FMT, level, function_name, prefix, &vaf);
+                printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
+                       __builtin_return_address(0), &vaf);
 
         va_end(args);
 }
-EXPORT_SYMBOL(drm_dev_printk);
+EXPORT_SYMBOL(drm_dev_dbg);
 
-void drm_printk(const char *level, unsigned int category,
-                const char *format, ...)
+void drm_dbg(unsigned int category, const char *format, ...)
 {
         struct va_format vaf;
         va_list args;
 
-        if (category != DRM_UT_NONE && !(drm_debug & category))
+        if (!(drm_debug & category))
                 return;
 
         va_start(args, format);
         vaf.fmt = format;
         vaf.va = &args;
 
-        printk("%s" "[" DRM_NAME ":%ps]%s %pV",
-               level, __builtin_return_address(0),
-               strcmp(level, KERN_ERR) == 0 ? " *ERROR*" : "", &vaf);
+        printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
+               __builtin_return_address(0), &vaf);
+
+        va_end(args);
+}
+EXPORT_SYMBOL(drm_dbg);
+
+void drm_err(const char *format, ...)
+{
+        struct va_format vaf;
+        va_list args;
+
+        va_start(args, format);
+        vaf.fmt = format;
+        vaf.va = &args;
+
+        printk(KERN_ERR "[" DRM_NAME ":%ps] *ERROR* %pV",
+               __builtin_return_address(0), &vaf);
 
         va_end(args);
 }
-EXPORT_SYMBOL(drm_printk);
+EXPORT_SYMBOL(drm_err);