Skip to contentSkip to conversation

drm: extra printk() wrapper macros

PATCH Superseded Dave Gordon 5 participants 16 messages Jul 11, 2016 – Jul 12, 2016

Subsystems (3)

v1 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH 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.

---
 include/drm/drmP.h | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)
include/drm/drmP.h +20 -6
index cf918e3e..82648b1 100644
@@ -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

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/3 drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN()

Where 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
index 2112e02..e299b64 100644
@@ -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
#2 lore raw

Re: [PATCH 2/3] drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN()

Quoted 13 lines · Dave Gordon

Where 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 +0 -0
index 2112e02..e299b64 100644

drivers/gpu/drm/i915/i915_guc_submission.c static int host2guc_action(struct intel_guc *guc, u32 *data, u32 len) · line 118

Quoted 9 lines
drivers/gpu/drm/i915/i915_guc_submission.c +2 -4
@@ -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)));

Hm, this does propagate the error code to the callers some which will act and log the failure. Majority won't though - like suspend/resume etc. In those cases it feels more like an error than a warning.

drivers/gpu/drm/i915/i915_guc_submission.c static int guc_ring_doorbell(struct i915_guc_client *gc) · line 555

Quoted 11 lines
drivers/gpu/drm/i915/i915_guc_submission.c +2 -2
  		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);

This one is interesting, error is propagated out a bit but then ignored in actual command submission.

If the above message means command will not be submitted error is probably more appropriate. Or perhaps we cannot tell if the command was submitted or not in this case?

Quoted 25 lines
drivers/gpu/drm/i915/i915_guc_submission.c +2 -4
  		/* 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;
  }

drivers/gpu/drm/i915/i915_guc_submission.c int i915_guc_submission_enable(struct drm_i915_private *dev_priv) · line 1000

Quoted 8 lines
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
@@ -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;
  	}
 

Regards,

Tvrtko

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

Re: [Intel-gfx] [PATCH 2/3] drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN()

Quoted 13 lines · Tvrtko Ursulin

drivers/gpu/drm/i915/i915_guc_submission.c static int guc_ring_doorbell(struct i915_guc_client *gc) · line 555

Quoted 8 lines · Dave Gordon
drivers/gpu/drm/i915/i915_guc_submission.c +2 -2
@@ -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);

This one is interesting, error is propagated out a bit but then ignored in actual command submission.

Quoted 3 lines

If the above message means command will not be submitted error is probably more appropriate. Or perhaps we cannot tell if the command was submitted or not in this case?

It's insignificant. An actual error would result in a GPU hang, and without being recorded in the error state any message here is useless. -Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#4 lore raw

Re: [PATCH 2/3] drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN()

Quoted 14 lines · Chris Wilson
Quoted 13 lines · Tvrtko Ursulin

drivers/gpu/drm/i915/i915_guc_submission.c static int guc_ring_doorbell(struct i915_guc_client *gc) · line 555

Quoted 8 lines · Dave Gordon
drivers/gpu/drm/i915/i915_guc_submission.c +2 -2
@@ -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);

This one is interesting, error is propagated out a bit but then ignored in actual command submission.

Quoted 6 lines
Quoted 3 lines

If the above message means command will not be submitted error is probably more appropriate. Or perhaps we cannot tell if the command was submitted or not in this case?

It's insignificant. An actual error would result in a GPU hang, and without being recorded in the error state any message here is useless.

I don't agree that it is useless, if it is a very unexpected situation it deserves to be logged. People do store and look at logs when things go bad.

Regards,

Tvrtko

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

Re: [PATCH 2/3] drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN()

In reply to Tvrtko Ursulin
Quoted 20 lines · Tvrtko Ursulin
Quoted 18 lines · Dave Gordon

Where 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 +0 -0
index 2112e02..e299b64 100644
@@ -114,10 +114,8 @@ static int host2guc_action(struct intel_guc *guc,
 u32 *data, u32 len)
          if (ret != -ETIMEDOUT)
              ret = -EIO;
 
Quoted 11 lines

drivers/gpu/drm/i915/i915_guc_submission.c static int host2guc_action(struct intel_guc *guc, u32 *data, u32 len) · line 118

Quoted 7 lines
drivers/gpu/drm/i915/i915_guc_submission.c +2 -4
-        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)));

Hm, this does propagate the error code to the callers some which will act and log the failure. Majority won't though - like suspend/resume etc. In those cases it feels more like an error than a warning.

It's definitely something that shouldn't happen, so we need to log it; and it has to be done at this level because we don't pass enough information back to leave it to the caller. But OTOH this layer doesn't have enough information to determine just how serious a failure is.

So as a compromise the idea is to log a WARNING here, and then the caller can choose to:
1. pass the failure up (until we reach a layer with more context)
2. quietly disregard the failure and continue anyway
3. report an ERROR and fail/abort the process.

That way we should get all the useful information about the root cause of something that ends up as an ERROR, while neither ignoring nor being too verbose about failures from which we may ultimately recover.

For example, one of the callers (the doorbell h/w initialisation code) considers some failures as interesting but not critical (DEBUG level) but other instances of the exact same operation are fatal (ERROR).

Quoted 15 lines

drivers/gpu/drm/i915/i915_guc_submission.c static int guc_ring_doorbell(struct · line 556

Quoted 11 lines
drivers/gpu/drm/i915/i915_guc_submission.c +0 -0
          dev_priv->guc.action_fail += 1;
          dev_priv->guc.action_err = ret;
drivers/gpu/drm/i915/i915_guc_submission.c +2 -2
@@ -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);

This one is interesting, error is propagated out a bit but then ignored in actual command submission.

Quoted 3 lines

If the above message means command will not be submitted error is probably more appropriate. Or perhaps we cannot tell if the command was submitted or not in this case?

Note that this is inside a retry loop. It shouldn't ever happen, but if it does we'll report it and try one more time. If it keeps happening (which would require active interference by some other party) we won't be able to ring the doorbell and the failure will be propagated back out of the GuC submission code. OTOH the caller then ignores it because "submission is not allowed to fail" (!)

And yes, it is then undefined as to whether the command has been submitted or not. If it hasn't we'll expect a GPU hang later.

.Dave.

Quoted 30 lines
Quoted 30 lines
drivers/gpu/drm/i915/i915_guc_submission.c +2 -2
          /* 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);
drivers/gpu/drm/i915/i915_guc_submission.c +0 -2
@@ -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;
  }
drivers/gpu/drm/i915/i915_guc_submission.c +0 -1
@@ -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");
Quoted 8 lines

drivers/gpu/drm/i915/i915_guc_submission.c int i915_guc_submission_enable(struct drm_i915_private *dev_priv) · line 999

Quoted 5 lines
drivers/gpu/drm/i915/i915_guc_submission.c +1 -0
+        DRM_ERROR("Failed to create normal GuC client!\n");
          return -ENOMEM;
      }

Regards,
Tvrtko

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw

PATCH 3/3 drm/i915/guc: revisit GuC loader message levels

In reply to Dave Gordon

Some downgraded from DRM_ERROR() to DRM_WARN(), some eliminated, and a few upgraded from DRM_INFO() to DRM_NOTE() or DRM_WARN().

---
 drivers/gpu/drm/i915/intel_guc_loader.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +10 -10
index 605c696..fd032eb 100644
@@ -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");
+		DRM_WARN("GEN%d does not support GuC operation\n", gen);
 		return GFXCORE_FAMILY_UNKNOWN;
 	}
 }
@@ -433,7 +435,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");
+		DRM_WARN("No GuC firmware known for this platform\n");
 		err = -ENODEV;
 		goto fail;
 	}
@@ -471,10 +473,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)
@@ -532,15 +532,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);
 	}
@@ -656,7 +656,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)
 fail:
 	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",
+	DRM_WARN("Failed to fetch GuC firmware from %s (error %d)\n",
 		  guc_fw->guc_fw_path, err);
 
 	mutex_lock(&dev->struct_mutex);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw

Re: [Intel-gfx] [PATCH 3/3] drm/i915/guc: revisit GuC loader message levels

Quoted 71 lines · Dave Gordon

Some downgraded from DRM_ERROR() to DRM_WARN(), some eliminated, and a few upgraded from DRM_INFO() to DRM_NOTE() or DRM_WARN().

---
  drivers/gpu/drm/i915/intel_guc_loader.c | 20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +9 -9
index 605c696..fd032eb 100644
@@ -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");
+		DRM_WARN("GEN%d does not support GuC operation\n", gen);
  		return GFXCORE_FAMILY_UNKNOWN;
  	}
  }
@@ -433,7 +435,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");
+		DRM_WARN("No GuC firmware known for this platform\n");
  		err = -ENODEV;
  		goto fail;
  	}
@@ -471,10 +473,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)
@@ -532,15 +532,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);
  	}

drivers/gpu/drm/i915/intel_guc_loader.c static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw) · line 662

Quoted 8 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1 -1
@@ -656,7 +656,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)
  fail:
  	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",
+	DRM_WARN("Failed to fetch GuC firmware from %s (error %d)\n",
  		  guc_fw->guc_fw_path, err);
 
  	mutex_lock(&dev->struct_mutex);

R-b if you also change all the other DRM_ERRORs in guc_fw_fetch to DRM_DEBUG_DRIVER and merge this last two log lines (DRM_DEBUG_DRIVER + DRM_WARN) to one. :)

Regards,

Tvrtko

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#8 lore raw

Re: [PATCH 3/3] drm/i915/guc: revisit GuC loader message levels

Quoted 93 lines · Tvrtko Ursulin
Quoted 84 lines · Dave Gordon

Some downgraded from DRM_ERROR() to DRM_WARN(), some eliminated, and a few upgraded from DRM_INFO() to DRM_NOTE() or DRM_WARN().

---
  drivers/gpu/drm/i915/intel_guc_loader.c | 20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +4 -2
index 605c696..fd032eb 100644
@@ -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");
+        DRM_WARN("GEN%d does not support GuC operation\n", gen);
          return GFXCORE_FAMILY_UNKNOWN;
      }
  }
drivers/gpu/drm/i915/intel_guc_loader.c +5 -7
@@ -433,7 +435,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");
+        DRM_WARN("No GuC firmware known for this platform\n");
          err = -ENODEV;
          goto fail;
      }
@@ -471,10 +473,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)
@@ -532,15 +532,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);
      }
drivers/gpu/drm/i915/intel_guc_loader.c +1 -1
@@ -656,7 +656,7 @@ static void guc_fw_fetch(struct drm_device *dev,
 struct intel_guc_fw *guc_fw)
  fail:
      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",
+    DRM_WARN("Failed to fetch GuC firmware from %s (error %d)\n",
            guc_fw->guc_fw_path, err);
Quoted 2 lines
      mutex_lock(&dev->struct_mutex);

R-b if you also change all the other DRM_ERRORs in guc_fw_fetch to DRM_DEBUG_DRIVER and merge this last two log lines (DRM_DEBUG_DRIVER + DRM_WARN) to one. :)

Quoted 2 lines

Regards,
Tvrtko

No, that wouldn't be appropriate. We want the user to be informed if any of these failures occurs, because it means their system is in some way misconfigured e.g. corrupted firmware file. That's definitely not a DEBUG-only event, and it must be logged even if we're going to try to continue in fallback mode.

I could change all the earlier ERRORs to NOTEs and leave just the last one as an ERROR i.e. explanation first, consequence after.

As for the DEBUG, that's for a different purpose. Whereas the various ERROR/NOTE/INFO messages relate to the existence, format, or content of the required firmware file in the filesystem or ramdisk, the DEBUG is about internal failures such as not being able to allocate memory, over which the user/administrator has no direct control.

I might swap them round though (i.e. DEBUG after the ERROR, to explain further than I want to in a user-facing message).

.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw
In reply to Dave Gordon
Quoted 21 lines · Dave Gordon

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.

---
  include/drm/drmP.h | 26 ++++++++++++++++++++------
  1 file changed, 20 insertions(+), 6 deletions(-)
include/drm/drmP.h +0 -0
index cf918e3e..82648b1 100644
@@ -162,6 +162,26 @@ void drm_err(const char *format, ...);
  /** \name Macros to make printk easier */
  /*@{*/
 

include/drm/drmP.h void drm_err(const char *format, ...); · line 174

Quoted 10 lines
include/drm/drmP.h +10 -0
+#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__)

To me DRM_NOTICE would be better to keep consistent with kernel naming for the equivalent log level.

Quoted 17 lines
include/drm/drmP.h +10 -0
+#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__);				\
  })

include/drm/drmP.h void drm_err(const char *format, ...); · line 212

Quoted 10 lines
include/drm/drmP.h +0 -6
 
-#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.
   *

Otherwise acked by me.

Regards,

Tvrtko

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw
Quoted 23 lines · Tvrtko Ursulin
Quoted 21 lines · Dave Gordon

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.

---
  include/drm/drmP.h | 26 ++++++++++++++++++++------
  1 file changed, 20 insertions(+), 6 deletions(-)
include/drm/drmP.h +0 -0
index cf918e3e..82648b1 100644
@@ -162,6 +162,26 @@ void drm_err(const char *format, ...);
  /** \name Macros to make printk easier */
  /*@{*/
 
Quoted 13 lines

include/drm/drmP.h void drm_err(const char *format, ...); · line 174

Quoted 10 lines
include/drm/drmP.h +10 -0
+#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__)

To me DRM_NOTICE would be better to keep consistent with kernel naming for the equivalent log level.

Maybe, but then we'd probably want DRM_WARNING() as well, and the names get cumbersome, especially when you want to tag "_ONCE" on the end as well. I liked the consistency of {INFO,NOTE,WARN} all being four letters ;)

Any comments from dri-devel on INFO/NOTE/WARN vs INFO/NOTICE/WARNING? Or any other suggestions?

.Dave.

Quoted 30 lines
Quoted 17 lines
include/drm/drmP.h +10 -0
+#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__);                \
  })

include/drm/drmP.h void drm_err(const char *format, ...); · line 212

Quoted 10 lines
include/drm/drmP.h +0 -6
 
-#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.
   *

Otherwise acked by me.

Quoted 2 lines

Regards,
Tvrtko

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#11 lore raw
Quoted 38 lines · Dave Gordon
Quoted 23 lines · Tvrtko Ursulin
Quoted 21 lines · Dave Gordon

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.

---
  include/drm/drmP.h | 26 ++++++++++++++++++++------
  1 file changed, 20 insertions(+), 6 deletions(-)
include/drm/drmP.h +0 -0
index cf918e3e..82648b1 100644
@@ -162,6 +162,26 @@ void drm_err(const char *format, ...);
  /** \name Macros to make printk easier */
  /*@{*/
 
Quoted 13 lines

include/drm/drmP.h void drm_err(const char *format, ...); · line 174

Quoted 10 lines
include/drm/drmP.h +10 -0
+#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__)

To me DRM_NOTICE would be better to keep consistent with kernel naming for the equivalent log level.

Quoted 6 lines

Maybe, but then we'd probably want DRM_WARNING() as well, and the names get cumbersome, especially when you want to tag "_ONCE" on the end as well. I liked the consistency of {INFO,NOTE,WARN} all being four letters ;)

Any comments from dri-devel on INFO/NOTE/WARN vs INFO/NOTICE/WARNING? Or any other suggestions?

Luckily kernel offers us precedent to avoid the DRM_WARNING verbosity and establish the only exception where log level symbolic name does not match the printk helper name. :)

#define pr_emerg(fmt, ...) \
        printk(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__)
#define pr_alert(fmt, ...) \
        printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)
#define pr_crit(fmt, ...) \
        printk(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__)
#define pr_err(fmt, ...) \
        printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
#define pr_warning(fmt, ...) \
        printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
#define pr_warn pr_warning
#define pr_notice(fmt, ...) \
        printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
#define pr_info(fmt, ...) \
        printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)

And short form is indeed more popular:

$ grep pr_warn\( drivers/ -r | wc -l
1935
$ grep pr_warning\( drivers/ -r | wc -l
141

Regards,

Tvrtko
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reviewed-by on v1 1/3
#12 lore raw
In reply to Dave Gordon
Quoted 18 lines · Dave Gordon

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.

---
 include/drm/drmP.h | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)
include/drm/drmP.h +0 -0
index cf918e3e..82648b1 100644

include/drm/drmP.h void drm_err(const char *format, ...); · line 165

Quoted 4 lines
include/drm/drmP.h +1 -0
@@ -162,6 +162,26 @@ void drm_err(const char *format, ...);
 /** \name Macros to make printk easier */
 /*@{*/
 
+#define	_DRM_PRINTK(once, level, fmt, ...)				\

Tab after #define?

Quoted 4 lines
include/drm/drmP.h +4 -0
+	do {								\
+		printk##once(KERN_##level "[" DRM_NAME "] " fmt,	\
+			     ##__VA_ARGS__);				\
+	} while (0)

include/drm/drmP.h void drm_err(const char *format, ...); · line 179

Quoted 10 lines
include/drm/drmP.h +10 -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__)

Missing ## here; should be: ##__VA_ARGS__
The rest looks good.

Quoted 23 lines
include/drm/drmP.h +5 -6
+#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 · 1 line
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#13 lore raw
In reply to Dave Gordon
Quoted 9 lines · Dave Gordon

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.

I'm not sure what exactly the brave new drm debug model should look like (probably some form of pimped dynamic debug printk, to be able to be backwards compatible with the gazillion of blog posts recommending to capture dmesg with drm.debug=0xe). But extending these is probably not what we want ...
-Daniel

Quoted 55 lines
---
 include/drm/drmP.h | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)
include/drm/drmP.h +20 -6
index cf918e3e..82648b1 100644
@@ -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

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#14 lore raw
Quoted 9 lines · Daniel Vetter
Quoted 8 lines · Dave Gordon

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.

Quoted 8 lines
Quoted 1 line

I'm not sure what exactly the brave new drm debug model should look like (probably some form of pimped dynamic debug printk, to be able to be backwards compatible with the gazillion of blog posts recommending to capture dmesg with drm.debug=0xe). But extending these is probably not what we want ...
-Daniel

These are not debug of any sort, these message are intended to be seen by the user (or administrator), and these macros allow us to emit the messages at the most appropriate kernel message level.

.Dave.

Quoted 51 lines
Quoted 51 lines
---
  include/drm/drmP.h | 26 ++++++++++++++++++++------
  1 file changed, 20 insertions(+), 6 deletions(-)
include/drm/drmP.h +20 -7
index cf918e3e..82648b1 100644
@@ -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.
   *
--

1.9.1

Quoted 5 lines
Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#15 lore raw
Quoted 19 lines · Dave Gordon
Quoted 9 lines · Daniel Vetter
Quoted 8 lines · Dave Gordon

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.

Quoted 8 lines
Quoted 1 line

I'm not sure what exactly the brave new drm debug model should look like (probably some form of pimped dynamic debug printk, to be able to be backwards compatible with the gazillion of blog posts recommending to capture dmesg with drm.debug=0xe). But extending these is probably not what we want ...
-Daniel

Quoted 3 lines

These are not debug of any sort, these message are intended to be seen by the user (or administrator), and these macros allow us to emit the messages at the most appropriate kernel message level.

Hm ok, I guess we can extend them for that.
-Daniel

Quoted 60 lines

.Dave.

Quoted 56 lines
Quoted 55 lines
---
  include/drm/drmP.h | 26 ++++++++++++++++++++------
  1 file changed, 20 insertions(+), 6 deletions(-)
include/drm/drmP.h +20 -7
index cf918e3e..82648b1 100644
@@ -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.
   *
--

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx