[Intel-gfx] [PATCH] drm/i915: Make __i915_printk debug output behave the same as DRM_DEBUG_DRIVER

Imre Deak imre.deak at intel.com
Mon Mar 21 15:08:57 UTC 2016

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 at linux.intel.com>
CC: Daniel Vetter <daniel.vetter at ffwll.ch>
CC: Chris Wilson <chris at chris-wilson.co.uk>
Signed-off-by: Imre Deak <imre.deak at intel.com>
 drivers/gpu/drm/i915/i915_dma.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 3f439a0..a3458fc 100644
--- 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;

More information about the Intel-gfx mailing list