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

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

[Imre Deak]

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>
---
 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;
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: warning for drm/i915: Make __i915_printk debug output behave the same as DRM_DEBUG_DRIVER

[Patchwork]

== Series Details ==

Series: drm/i915: Make __i915_printk debug output behave the same as DRM_DEBUG_DRIVER
URL   : https://patchwork.freedesktop.org/series/4713/
State : warning

== Summary ==

Series 4713v1 drm/i915: Make __i915_printk debug output behave the same as DRM_DEBUG_DRIVER
http://patchwork.freedesktop.org/api/1.0/series/4713/revisions/1/mbox/

Test gem_exec_suspend:
        Subgroup basic-s3:
                pass       -> DMESG-WARN (bsw-nuc-2)
Test kms_flip:
        Subgroup basic-flip-vs-wf_vblank:
                pass       -> FAIL       (ilk-hp8440p) UNSTABLE
        Subgroup basic-plain-flip:
                pass       -> DMESG-WARN (hsw-brixbox)
                dmesg-warn -> PASS       (bdw-ultra)
Test kms_force_connector_basic:
        Subgroup prune-stale-modes:
                pass       -> SKIP       (ivb-t430s)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-c:
                dmesg-warn -> PASS       (bsw-nuc-2)
Test pm_rpm:
        Subgroup basic-pci-d3-state:
                fail       -> DMESG-FAIL (snb-x220t)
                pass       -> DMESG-WARN (snb-dellxps)
                pass       -> DMESG-WARN (bsw-nuc-2)
        Subgroup basic-rte:
                dmesg-warn -> PASS       (snb-x220t)
                dmesg-warn -> PASS       (byt-nuc) UNSTABLE

bdw-nuci7        total:192  pass:180  dwarn:0   dfail:0   fail:0   skip:12 
bdw-ultra        total:192  pass:171  dwarn:0   dfail:0   fail:0   skip:21 
bsw-nuc-2        total:192  pass:153  dwarn:2   dfail:0   fail:0   skip:37 
byt-nuc          total:192  pass:157  dwarn:0   dfail:0   fail:0   skip:35 
hsw-brixbox      total:192  pass:169  dwarn:1   dfail:0   fail:0   skip:22 
ilk-hp8440p      total:192  pass:127  dwarn:1   dfail:0   fail:1   skip:63 
ivb-t430s        total:192  pass:166  dwarn:0   dfail:0   fail:0   skip:26 
skl-i5k-2        total:192  pass:169  dwarn:0   dfail:0   fail:0   skip:23 
skl-i7k-2        total:192  pass:169  dwarn:0   dfail:0   fail:0   skip:23 
snb-dellxps      total:192  pass:156  dwarn:2   dfail:0   fail:0   skip:34 
snb-x220t        total:192  pass:158  dwarn:0   dfail:1   fail:0   skip:33 

Results at /archive/results/CI_IGT_test/Patchwork_1664/

4b39223f6e3bef4dfa678f7239dcd87c38e20e96 drm-intel-nightly: 2016y-03m-21d-18h-43m-18s UTC integration manifest
afb0c7fae0d66092a22a9b7e07ddc60ecd84c5b8 drm/i915: Make __i915_printk debug output behave the same as DRM_DEBUG_DRIVER

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Chris Wilson]

On Mon, Mar 21, 2016 at 05:08:57PM +0200, Imre Deak wrote:
> 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>
> ---
>  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;

This feels overly restrictive for __i915_printk. It makes sense for
report_error, but that is already KERN_ERR only.

From the point-of-view that we are documenting what needs to be done in
future,
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Imre Deak]

On ti, 2016-03-22 at 09:42 +0000, Chris Wilson wrote:
> On Mon, Mar 21, 2016 at 05:08:57PM +0200, Imre Deak wrote:
> > 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>
> > ---
> >  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;
> 
> This feels overly restrictive for __i915_printk. It makes sense for
> report_error, but that is already KERN_ERR only.

It's also used by failure injection. But yes, I agree that in the
future a more generic mapping from DRM debug mask to dynamic debug
filtering could be used instead of this (also considered already by
Joonas and Daniel).

> From the point-of-view that we are documenting what needs to be done
> in
> future,
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

Thanks,
Imre

> -Chris
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: ✗ Fi.CI.BAT: warning for drm/i915: Make __i915_printk debug output behave the same as DRM_DEBUG_DRIVER

[Imre Deak]

On ti, 2016-03-22 at 08:04 +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: Make __i915_printk debug output behave the same as
> DRM_DEBUG_DRIVER
> URL   : https://patchwork.freedesktop.org/series/4713/
> State : warning
> 
> == Summary ==
> 
> Series 4713v1 drm/i915: Make __i915_printk debug output behave the
> same as DRM_DEBUG_DRIVER
> http://patchwork.freedesktop.org/api/1.0/series/4713/revisions/1/mbox
> /
> 
> Test gem_exec_suspend:
>         Subgroup basic-s3:
>                 pass       -> DMESG-WARN (bsw-nuc-2)

Unrelated, lockdep issue among ggtt_bind_vma/stop_machine, mmap,
kernfs_fop_write, device_unregister:
https://bugs.freedesktop.org/show_bug.cgi?id=94350

> Test kms_flip:
>         Subgroup basic-flip-vs-wf_vblank:
>                 pass       -> FAIL       (ilk-hp8440p) UNSTABLE

Unrelated, 1 frame long inter-vblank ts jitter with seq_step=10:
https://bugs.freedesktop.org/show_bug.cgi?id=94294

>         Subgroup basic-plain-flip:
>                 pass       -> DMESG-WARN (hsw-brixbox)

Unrelated, watermark programming while device off, should be fixed now
in -nightly.

>                 dmesg-warn -> PASS       (bdw-ultra)
> Test kms_force_connector_basic:
>         Subgroup prune-stale-modes:
>                 pass       -> SKIP       (ivb-t430s)
> Test kms_pipe_crc_basic:
>         Subgroup suspend-read-crc-pipe-c:
>                 dmesg-warn -> PASS       (bsw-nuc-2)
> Test pm_rpm:
>         Subgroup basic-pci-d3-state:
>                 fail       -> DMESG-FAIL (snb-x220t)
>                 pass       -> DMESG-WARN (snb-dellxps)

Both of the above, the same watermark programming problem as above.

>                 pass       -> DMESG-WARN (bsw-nuc-2)

Unrelated, unclaimed access prior to suspending, pm_rpm@basic-pci-d3-st
ate:
https://bugs.freedesktop.org/show_bug.cgi?id=94164

>         Subgroup basic-rte:
>                 dmesg-warn -> PASS       (snb-x220t)
>                 dmesg-warn -> PASS       (byt-nuc) UNSTABLE

Not on the above list, I don't know why:
- igt@kms_flip@basic-flip-vs-dpms: FIFO underrun on ilk-hp8440p:
Unrelated, https://bugs.freedesktop.org/show_bug.cgi?id=93787

I pushed the patch to -dinq, thanks for the review.

--Imre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx