| Message ID | 1468930818-22085-1-git-send-email-david.s.gordon@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 19/07/16 14:53, Patchwork wrote: > == Series Details == > > Series: series starting with [CI-RESEND,1/3] drm: extra printk() wrapper macros > URL : https://patchwork.freedesktop.org/series/10036/ > State : success > > == Summary == > > Series 10036v1 Series without cover letter > http://patchwork.freedesktop.org/api/1.0/series/10036/revisions/1/mbox > > Test drv_module_reload_basic: > dmesg-warn -> PASS (ro-skl3-i5-6260u) > Test gem_sync: > Subgroup basic-store-each: > fail -> DMESG-FAIL (ro-bdw-i7-5600u) This is (now) Bug 96974 https://bugs.freedesktop.org/show_bug.cgi?id=96974 [BAT BDW] gem_sync / basic-store-each fails sporadically I filed this too, but Villa beat me by a couple of minutes, so my bug 96975 is now a dup of 96974. Maybe we should get another identical machine and see whether the results are consistent, 'cos the other BDWs aren't showing this at all. .Dave. > fi-hsw-i7-4770k total:243 pass:213 dwarn:0 dfail:0 fail:10 skip:20 > fi-kbl-qkkr total:243 pass:178 dwarn:27 dfail:1 fail:10 skip:27 > fi-skl-i5-6260u total:243 pass:222 dwarn:0 dfail:0 fail:9 skip:12 > fi-skl-i7-6700k total:243 pass:208 dwarn:0 dfail:0 fail:9 skip:26 > fi-snb-i7-2600 total:243 pass:193 dwarn:0 dfail:0 fail:10 skip:40 > ro-bdw-i5-5250u total:244 pass:217 dwarn:4 dfail:0 fail:10 skip:13 > ro-bdw-i7-5557U total:244 pass:219 dwarn:1 dfail:0 fail:9 skip:15 > ro-bdw-i7-5600u total:244 pass:201 dwarn:0 dfail:1 fail:10 skip:32 > ro-bsw-n3050 total:218 pass:173 dwarn:0 dfail:0 fail:2 skip:42 > ro-byt-n2820 total:244 pass:194 dwarn:0 dfail:0 fail:12 skip:38 > ro-hsw-i3-4010u total:244 pass:209 dwarn:0 dfail:0 fail:11 skip:24 > ro-hsw-i7-4770r total:244 pass:209 dwarn:0 dfail:0 fail:11 skip:24 > ro-ilk-i7-620lm total:244 pass:169 dwarn:0 dfail:0 fail:12 skip:63 > ro-ilk1-i5-650 total:239 pass:170 dwarn:0 dfail:0 fail:11 skip:58 > ro-ivb-i7-3770 total:244 pass:200 dwarn:0 dfail:0 fail:11 skip:33 > ro-skl3-i5-6260u total:244 pass:222 dwarn:0 dfail:0 fail:10 skip:12 > ro-snb-i7-2620M total:244 pass:190 dwarn:0 dfail:0 fail:12 skip:42 > > Results at /archive/results/CI_IGT_test/RO_Patchwork_1531/ > > 635555a drm-intel-nightly: 2016y-07m-19d-13h-02m-39s UTC integration manifest > b23d573 drm/i915/guc: revisit GuC loader message levels > 950c1a4 drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN() > 5e8e33b drm: extra printk() wrapper macros >
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index d377865..3669cdd 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -162,6 +162,26 @@ void drm_err(const char *format, ...); /** \name Macros to make printk easier */ /*@{*/ +#define _DRM_PRINTK(once, level, fmt, ...) \ + do { \ + printk##once(KERN_##level "[" DRM_NAME "] " fmt, \ + ##__VA_ARGS__); \ + } while (0) + +#define DRM_INFO(fmt, ...) \ + _DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__) +#define DRM_NOTE(fmt, ...) \ + _DRM_PRINTK(, NOTICE, fmt, ##__VA_ARGS__) +#define DRM_WARN(fmt, ...) \ + _DRM_PRINTK(, WARNING, fmt, ##__VA_ARGS__) + +#define DRM_INFO_ONCE(fmt, ...) \ + _DRM_PRINTK(_once, INFO, fmt, ##__VA_ARGS__) +#define DRM_NOTE_ONCE(fmt, ...) \ + _DRM_PRINTK(_once, NOTICE, fmt, ##__VA_ARGS__) +#define DRM_WARN_ONCE(fmt, ...) \ + _DRM_PRINTK(_once, WARNING, fmt, ##__VA_ARGS__) + /** * Error output. * @@ -187,12 +207,6 @@ void drm_err(const char *format, ...); drm_err(fmt, ##__VA_ARGS__); \ }) -#define DRM_INFO(fmt, ...) \ - printk(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__) - -#define DRM_INFO_ONCE(fmt, ...) \ - printk_once(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__) - /** * Debug output. *
We had only DRM_INFO() and DRM_ERROR(), whereas the underlying printk() provides several other useful intermediate levels such as NOTICE and WARNING. So this patch fills out the set by providing both regular and once-only macros for each of the levels INFO, NOTICE, and WARNING, using a common underlying macro that does all the token-pasting. DRM_ERROR is unchanged, as it's not just a printk wrapper. v2: Fix whitespace, missing ## (Eric Engestrom) Signed-off-by: Dave Gordon <david.s.gordon@intel.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> --- include/drm/drmP.h | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)