drm/i915/guc: emit (drm) messages at the most appropriate level
Subsystems (3)
v4 cover drm/i915/guc: emit (drm) messages at the most appropriate level
A few adjustments to the messages emitted from the driver, promoting or demoting them to the level most suited to the target audience as well as the impact of the thing being reported.
Dave Gordon (3):
drm: extra printk() wrapper macros
drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN() drm/i915/guc: revisit GuC loader message levels
drivers/gpu/drm/i915/i915_guc_submission.c | 18 ++++++---------- drivers/gpu/drm/i915/intel_guc_loader.c | 34 +++++++++++++++--------------- include/drm/drmP.h | 26 +++++++++++++++++------ 3 files changed, 44 insertions(+), 34 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/3 drm: extra printk() wrapper macros
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)
--- include/drm/drmP.h | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
include/drm/drmP.h +20 -6
@@ -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. *
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v4 2/3 drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN()
In reply to Dave GordonWhere we're going to continue regardless of the problem, rather than fail, then the message should be a WARNing rather than an ERROR.
--- drivers/gpu/drm/i915/i915_guc_submission.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +7 -11
@@ -114,10 +114,8 @@ static int host2guc_action(struct intel_guc *guc, u32 *data, u32 len)if (ret != -ETIMEDOUT ) ret = -EIO ; -DRM_ERROR ("GUC: host2guc action 0x%X failed. ret=%d " -"status=0x%08X response=0x%08X\n" , - data[0 ], ret, status, -I915_READ (SOFT_SCRATCH (15 ))); +DRM_WARN ("Action 0x%X failed; ret=%d status=0x%08X response=0x%08X\n" , + data[0 ], ret, status,I915_READ (SOFT_SCRATCH (15 ))); dev_priv->guc.action_fail +=1 ; dev_priv->guc.action_err = ret;
@@ -553,8 +551,8 @@ static int guc_ring_doorbell(struct i915_guc_client *gc)if (db_ret.db_status ==GUC_DOORBELL_DISABLED )break ; -DRM_ERROR ("Cookie mismatch. Expected %d, returned %d\n" , - db_cmp.cookie, db_ret.cookie); +DRM_WARN ("Cookie mismatch. Expected %d, found %d\n" , + db_cmp.cookie, db_ret.cookie);/* update the cookie to newly read cookie from GuC */ db_cmp.cookie = db_ret.cookie;
@@ -726,8 +724,8 @@ static void guc_init_doorbell_hw(struct intel_guc *guc)/* Restore to original value */ err =guc_update_doorbell_id (guc, client, db_id);if (err) -DRM_ERROR ("Failed to restore doorbell to %d, err %d\n" , - db_id, err); +DRM_WARN ("Failed to restore doorbell to %d, err %d\n" , + db_id, err);for (i =0 ; i <GUC_MAX_DOORBELLS ; ++i) {i915_reg_t drbreg =GEN8_DRBREGL (i);
@@ -819,8 +817,6 @@ static void guc_init_doorbell_hw(struct intel_guc *guc)return client; err: -DRM_ERROR ("FAILED to create priority %u GuC client!\n" , priority); -guc_client_free (dev_priv, client);return NULL ; }
@@ -998,7 +994,7 @@ int i915_guc_submission_enable(struct drm_i915_private *dev_priv)GUC_CTX_PRIORITY_KMD_NORMAL , dev_priv->kernel_context);if (!client) { -DRM_ERROR ("Failed to create execbuf guc_client\n" ); +DRM_ERROR ("Failed to create normal GuC client!\n" );return -ENOMEM ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 3/3 drm/i915/guc: revisit GuC loader message levels
In reply to Dave GordonSome downgraded from DRM_ERROR() to DRM_WARN() or DRM_NOTE(), a few upgraded from DRM_INFO() to DRM_NOTE() or DRM_WARN(), and one eliminated completely.
v2: different permutation of levels :)
v3: convert a couple of "this shouldn't happen" messages to WARN()
--- drivers/gpu/drm/i915/intel_guc_loader.c | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +17 -17
@@ -140,12 +140,14 @@ static u32 get_gttype(struct drm_i915_private *dev_priv)static u32 get_core_family (struct drm_i915_private *dev_priv) { -switch (INTEL_INFO (dev_priv)->gen) { +u32 gen =INTEL_GEN (dev_priv); + +switch (gen) {case 9 :return GFXCORE_FAMILY_GEN9 ;default : -DRM_ERROR ("GUC: unsupported core family\n" ); +WARN (1 ,"GEN%d does not support GuC operation!\n" , gen);return GFXCORE_FAMILY_UNKNOWN ; } }
@@ -435,7 +437,7 @@ int intel_guc_setup(struct drm_device *dev) goto fail; }else if (*fw_path =='\0' ) {/* Device has a GuC but we don't know what f/w to load? */ -DRM_INFO ("No GuC firmware known for this platform\n" ); +WARN (1 ,"No GuC firmware known for this platform!\n" ); err = -ENODEV ; goto fail; }
@@ -473,10 +475,8 @@ int intel_guc_setup(struct drm_device *dev)* that the state and timing are fairly predictable */ err =i915_reset_guc (dev_priv); -if (err) { -DRM_ERROR ("GuC reset failed: %d\n" , err); +if (err) goto fail; - } err =guc_ucode_xfer (dev_priv);if (!err)
@@ -534,15 +534,15 @@ int intel_guc_setup(struct drm_device *dev)else if (err ==0 )DRM_INFO ("GuC firmware load skipped\n" );else if (ret != -EIO ) -DRM_INFO ("GuC firmware load failed: %d\n" , err); +DRM_NOTE ("GuC firmware load failed: %d\n" , err);else -DRM_ERROR ("GuC firmware load failed: %d\n" , err); +DRM_WARN ("GuC firmware load failed: %d\n" , err);if (i915.enable_guc_submission) {if (fw_path ==NULL )DRM_INFO ("GuC submission without firmware not supported\n" );if (ret ==0 ) -DRM_INFO ("Falling back from GuC submission to execlist mode\n" ); +DRM_NOTE ("Falling back from GuC submission to execlist mode\n" );else DRM_ERROR ("GuC init failed: %d\n" , ret); }
@@ -573,7 +573,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)/* Check the size of the blob before examining buffer contents */ if (fw->size <sizeof (struct guc_css_header )) { -DRM_ERROR ("Firmware header is missing\n" ); +DRM_NOTE ("Firmware header is missing\n" ); goto fail; }
@@ -585,7 +585,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw) css->key_size_dw - css->exponent_size_dw) * sizeof(u32);if (guc_fw->header_size !=sizeof (struct guc_css_header )) { -DRM_ERROR ("CSS header definition mismatch\n" ); +DRM_NOTE ("CSS header definition mismatch\n" ); goto fail; }
@@ -595,7 +595,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)/* now RSA */ if (css->key_size_dw !=UOS_RSA_SCRATCH_MAX_COUNT ) { -DRM_ERROR ("RSA key size is bad\n" ); +DRM_NOTE ("RSA key size is bad\n" ); goto fail; } guc_fw->rsa_offset = guc_fw->ucode_offset + guc_fw->ucode_size;
@@ -604,14 +604,14 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)/* At least, it should have header, uCode and RSA. Size of all three. */ size = guc_fw->header_size + guc_fw->ucode_size + guc_fw->rsa_size;if (fw->size < size) { -DRM_ERROR ("Missing firmware components\n" ); +DRM_NOTE ("Missing firmware components\n" ); goto fail; }/* Header and uCode will be loaded to WOPCM. Size of the two. */ size = guc_fw->header_size + guc_fw->ucode_size;if (size >guc_wopcm_size (to_i915 (dev))) { -DRM_ERROR ("Firmware is too large to fit in WOPCM\n" ); +DRM_NOTE ("Firmware is too large to fit in WOPCM\n" ); goto fail; }
@@ -626,7 +626,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)if (guc_fw->guc_fw_major_found != guc_fw->guc_fw_major_wanted || guc_fw->guc_fw_minor_found < guc_fw->guc_fw_minor_wanted) { -DRM_ERROR ("GuC firmware version %d.%d, required %d.%d\n" , +DRM_NOTE ("GuC firmware version %d.%d, required %d.%d\n" , guc_fw->guc_fw_major_found, guc_fw->guc_fw_minor_found, guc_fw->guc_fw_major_wanted, guc_fw->guc_fw_minor_wanted); err = -ENOEXEC ;
@@ -656,10 +656,10 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)return ; fail: +DRM_WARN ("Failed to fetch valid GuC firmware from %s (error %d)\n" , + guc_fw->guc_fw_path, err);DRM_DEBUG_DRIVER ("GuC fw fetch status FAIL; err %d, fw %p, obj %p\n" , err, fw, guc_fw->guc_fw_obj); -DRM_ERROR ("Failed to fetch GuC firmware from %s (error %d)\n" , - guc_fw->guc_fw_path, err);mutex_lock (&dev->struct_mutex); obj = guc_fw->guc_fw_obj;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Ro.CI.BAT: failure for drm/i915/guc: emit (drm) messages at the most appropriate level
In reply to Dave Gordon== Series Details ==
== Series Details ==
Series: drm/i915/guc: emit (drm) messages at the most appropriate level
URL : https://patchwork.freedesktop.org/series/10150/
State : failure
== Summary ==
Series 10150v1 drm/i915/guc: emit (drm) messages at the most appropriate level
http://patchwork.freedesktop.org/api/1.0/series/10150/revisions/1/mbox
Test gem_sync:
Subgroup basic-store-each:
pass -> DMESG-FAIL (ro-bdw-i7-5600u)fi-hsw-i7-4770k total:244 pass:216 dwarn:0 dfail:0 fail:8 skip:20 fi-kbl-qkkr total:244 pass:180 dwarn:27 dfail:1 fail:9 skip:27 fi-skl-i5-6260u total:244 pass:224 dwarn:0 dfail:0 fail:8 skip:12 fi-skl-i7-6700k total:244 pass:210 dwarn:0 dfail:0 fail:8 skip:26 fi-snb-i7-2600 total:244 pass:196 dwarn:0 dfail:0 fail:8 skip:40 ro-bdw-i5-5250u total:244 pass:219 dwarn:4 dfail:0 fail:8 skip:13 ro-bdw-i7-5557U total:244 pass:221 dwarn:1 dfail:0 fail:8 skip:14 ro-bdw-i7-5600u total:244 pass:203 dwarn:0 dfail:1 fail:8 skip:32 ro-bsw-n3050 total:218 pass:173 dwarn:0 dfail:0 fail:2 skip:42 ro-byt-n2820 total:244 pass:197 dwarn:0 dfail:0 fail:9 skip:38 ro-hsw-i3-4010u total:244 pass:212 dwarn:0 dfail:0 fail:8 skip:24 ro-hsw-i7-4770r total:244 pass:212 dwarn:0 dfail:0 fail:8 skip:24 ro-ilk-i7-620lm total:244 pass:172 dwarn:0 dfail:0 fail:9 skip:63 ro-ilk1-i5-650 total:239 pass:172 dwarn:0 dfail:0 fail:9 skip:58 ro-ivb-i7-3770 total:244 pass:203 dwarn:0 dfail:0 fail:8 skip:33 ro-skl3-i5-6260u total:244 pass:224 dwarn:0 dfail:0 fail:8 skip:12 ro-snb-i7-2620M total:244 pass:193 dwarn:0 dfail:0 fail:9 skip:42
Results at /archive/results/CI_IGT_test/RO_Patchwork_1566/
cf82f46 drm-intel-nightly: 2016y-07m-21d-20h-43m-36s UTC integration manifest 5c44b9b drm/i915/guc: revisit GuC loader message levels
50ffd43 drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN() 900ee7b drm: extra printk() wrapper macros
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Ro.CI.BAT: failure for drm/i915/guc: emit (drm) messages at the most appropriate level
Quoted 6 lines · Patchwork
== Series Details ==
Series: drm/i915/guc: emit (drm) messages at the most appropriate level
URL : https://patchwork.freedesktop.org/series/10150/
State : failure
Quoted 8 lines
== Summary ==
Series 10150v1 drm/i915/guc: emit (drm) messages at the most appropriate level
http://patchwork.freedesktop.org/api/1.0/series/10150/revisions/1/mboxTest
gem_sync:Subgroup basic-store-each: pass -> DMESG-FAIL (ro-bdw-i7-5600u)
The now-familiar https://bugs.freedesktop.org/show_bug.cgi?id=96974
Bug 96974 - [BAT BDW] gem_sync / basic-store-each fails sporadically Though it looks like Chris may have a fix for this :)
.Dave.
Quoted 18 lines
fi-hsw-i7-4770k total:244 pass:216 dwarn:0 dfail:0 fail:8 skip:20 fi-kbl-qkkr total:244 pass:180 dwarn:27 dfail:1 fail:9 skip:27 fi-skl-i5-6260u total:244 pass:224 dwarn:0 dfail:0 fail:8 skip:12 fi-skl-i7-6700k total:244 pass:210 dwarn:0 dfail:0 fail:8 skip:26 fi-snb-i7-2600 total:244 pass:196 dwarn:0 dfail:0 fail:8 skip:40 ro-bdw-i5-5250u total:244 pass:219 dwarn:4 dfail:0 fail:8 skip:13 ro-bdw-i7-5557U total:244 pass:221 dwarn:1 dfail:0 fail:8 skip:14 ro-bdw-i7-5600u total:244 pass:203 dwarn:0 dfail:1 fail:8 skip:32 ro-bsw-n3050 total:218 pass:173 dwarn:0 dfail:0 fail:2 skip:42 ro-byt-n2820 total:244 pass:197 dwarn:0 dfail:0 fail:9 skip:38 ro-hsw-i3-4010u total:244 pass:212 dwarn:0 dfail:0 fail:8 skip:24 ro-hsw-i7-4770r total:244 pass:212 dwarn:0 dfail:0 fail:8 skip:24 ro-ilk-i7-620lm total:244 pass:172 dwarn:0 dfail:0 fail:9 skip:63 ro-ilk1-i5-650 total:239 pass:172 dwarn:0 dfail:0 fail:9 skip:58 ro-ivb-i7-3770 total:244 pass:203 dwarn:0 dfail:0 fail:8 skip:33 ro-skl3-i5-6260u total:244 pass:224 dwarn:0 dfail:0 fail:8 skip:12 ro-snb-i7-2620M total:244 pass:193 dwarn:0 dfail:0 fail:9 skip:42
Quoted 6 lines
Results at /archive/results/CI_IGT_test/RO_Patchwork_1566/
cf82f46 drm-intel-nightly: 2016y-07m-21d-20h-43m-36s UTC integration manifest 5c44b9b drm/i915/guc: revisit GuC loader message levels
50ffd43 drm/i915/guc: downgrade someDRM_ERROR()messages toDRM_WARN()900ee7b drm: extraprintk()wrapper macros
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx