drm: Introduce DRM_DEV_* log messages

This patch consolidates all the various log functions/macros into
one uber function, drm_log. It also introduces some new DRM_DEV_*
variants that print the device name to delineate multiple devices
of the same type.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1471303084-3757-1-git-send-email-seanpaul@chromium.org

1 files changed, 19 insertions, 8 deletions

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 57ce9734e0c6..a7f628298365 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -63,37 +63,48 @@ static struct idr drm_minors_idr;
 
 static struct dentry *drm_debugfs_root;
 
-void drm_err(const char *format, ...)
+#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, ...)
 {
         struct va_format vaf;
         va_list args;
 
-        va_start(args, format);
+        if (category != DRM_UT_NONE && !(drm_debug & category))
+                return;
 
+        va_start(args, format);
         vaf.fmt = format;
         vaf.va = &args;
 
-        printk(KERN_ERR "[" DRM_NAME ":%ps] *ERROR* %pV",
-               __builtin_return_address(0), &vaf);
+        dev_printk(level, dev, DRM_PRINTK_FMT, function_name, prefix,
+                   &vaf);
 
         va_end(args);
 }
-EXPORT_SYMBOL(drm_err);
+EXPORT_SYMBOL(drm_dev_printk);
 
-void drm_ut_debug_printk(const char *function_name, const char *format, ...)
+void drm_printk(const char *level, unsigned int category,
+                const char *function_name, const char *prefix,
+                const char *format, ...)
 {
         struct va_format vaf;
         va_list args;
 
+        if (category != DRM_UT_NONE && !(drm_debug & category))
+                return;
+
         va_start(args, format);
         vaf.fmt = format;
         vaf.va = &args;
 
-        printk(KERN_DEBUG "[" DRM_NAME ":%s] %pV", function_name, &vaf);
+        printk("%s" DRM_PRINTK_FMT, level, function_name, prefix, &vaf);
 
         va_end(args);
 }
-EXPORT_SYMBOL(drm_ut_debug_printk);
+EXPORT_SYMBOL(drm_printk);
 
 /*
  * DRM Minors