diff options
| author | Imre Deak <imre.deak@intel.com> | 2016-03-21 17:08:57 +0200 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2016-03-22 14:49:49 +0200 |
| commit | ad45d83968caf8e757cf895f4fd53903a092fad8 (patch) | |
| tree | b85cf4e88e777316f619e8c0bc7489a1bcc33b78 /drivers/gpu/drm/i915 | |
| parent | 177246a84d133888b5428e44201282d94635f473 (diff) | |
| download | blackbird-op-linux-ad45d83968caf8e757cf895f4fd53903a092fad8.tar.gz blackbird-op-linux-ad45d83968caf8e757cf895f4fd53903a092fad8.zip | |
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
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 3f439a08387e..a3458fcd83dc 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; |
