drm/i915: Make __i915_printk debug output behave the same as DRM_DEBUG_DRIVER

Joonas and Daniel remarked that our debugging output should stay compatible
with the core DRM's debug facility. The recently added __i915_printk() would
output debug messages even if debugging is completely disabled via the
drm.debug option. To fix this make __i915_printk behave the same as
DRM_DEBUG_DRIVER in this case.

CC: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
CC: Daniel Vetter <daniel.vetter@ffwll.ch>
CC: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1458572937-21712-1-git-send-email-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 3f439a08387e57033c61180371ae2e3f66109c8a..a3458fcd83dc9c9e9aa15d85b8381d8abd64a052 100644 (file)
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -77,9 +77,13 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level,
        static bool shown_bug_once;
        struct device *dev = dev_priv->dev->dev;
        bool is_error = level[1] <= KERN_ERR[1];
+       bool is_debug = level[1] == KERN_DEBUG[1];
        struct va_format vaf;
        va_list args;
 
+       if (is_debug && !(drm_debug & DRM_UT_DRIVER))
+               return;
+
        va_start(args, fmt);
 
        vaf.fmt = fmt;