From: Ben Skeggs Date: Fri, 4 Nov 2016 07:20:36 +0000 (+1000) Subject: drm/nouveau/kms/nv50: control evo trace output with DRM_UT_KMS X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7f55a072931922ec5eecbdc2657fb57b3c424d8a;p=linux-beck.git drm/nouveau/kms/nv50: control evo trace output with DRM_UT_KMS Will be useful in debugging the transition to atomic. Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 1f4e1370ea7d..9a04ee5bd148 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -463,21 +463,19 @@ evo_kick(u32 *push, void *evoc) mutex_unlock(&dmac->lock); } -#if 1 -#define evo_mthd(p,m,s) *((p)++) = (((s) << 18) | (m)) -#define evo_data(p,d) *((p)++) = (d) -#else #define evo_mthd(p,m,s) do { \ const u32 _m = (m), _s = (s); \ - printk(KERN_ERR "%04x %d %s\n", _m, _s, __func__); \ + if (drm_debug & DRM_UT_KMS) \ + printk(KERN_ERR "%04x %d %s\n", _m, _s, __func__); \ *((p)++) = ((_s << 18) | _m); \ } while(0) + #define evo_data(p,d) do { \ const u32 _d = (d); \ - printk(KERN_ERR "\t%08x\n", _d); \ + if (drm_debug & DRM_UT_KMS) \ + printk(KERN_ERR "\t%08x\n", _d); \ *((p)++) = _d; \ } while(0) -#endif static bool evo_sync_wait(void *data)