Skip to content

Commit

Permalink
drm/i915: Make __i915_printk debug output behave the same as DRM_DEBU…
Browse files Browse the repository at this point in the history
…G_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
  • Loading branch information
Imre Deak committed Mar 22, 2016
1 parent 177246a commit ad45d83
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/gpu/drm/i915/i915_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit ad45d83

Please sign in to comment.