diff mbox

[2/5] drm/i915/uc: Add intel_uc_fw_type_repr()

Message ID 20170327172000.169232-1-michal.wajdeczko@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Michal Wajdeczko March 27, 2017, 5:20 p.m. UTC 
Some of the DRM_NOTE messages are just using "uC" without specifying
which uc they are related to. We can be more user friendly.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_uc.c | 19 +++++++++++++++++--
 drivers/gpu/drm/i915/intel_uc.h |  1 +
 2 files changed, 18 insertions(+), 2 deletions(-)

Comments

Joonas Lahtinen March 28, 2017, 7:07 a.m. UTC | #1 
On ma, 2017-03-27 at 17:20 +0000, Michal Wajdeczko wrote:
> Some of the DRM_NOTE messages are just using "uC" without specifying
> which uc they are related to. We can be more user friendly.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

<SNIP>

> @@ -44,6 +44,19 @@ const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
>  	}
>  }
>  
> +/* User-friendly representation of an enum */
> +const char *intel_uc_fw_type_repr(enum intel_uc_fw_type status)

This could too, be in the header.

> +{
> +	switch (status) {
> +	case INTEL_UC_FW_TYPE_GUC:
> +		return "GuC";
> +	case INTEL_UC_FW_TYPE_HUC:
> +		return "HuC";
> +	default:

Add MISSING_CASE(status) and this is;

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

> +		return "<invalid>";
> +	}
> +}

<SNIP>
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index bbfbda4..8c53442 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -44,6 +44,19 @@  const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
 	}
 }
 
+/* User-friendly representation of an enum */
+const char *intel_uc_fw_type_repr(enum intel_uc_fw_type status)
+{
+	switch (status) {
+	case INTEL_UC_FW_TYPE_GUC:
+		return "GuC";
+	case INTEL_UC_FW_TYPE_HUC:
+		return "HuC";
+	default:
+		return "<invalid>";
+	}
+}
+
 /* Reset GuC providing us with fresh state for both GuC and HuC.
  */
 static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv)
@@ -200,10 +213,12 @@  static void fetch_uc_fw(struct drm_i915_private *dev_priv,
 	}
 
 	if (uc_fw->major_ver_wanted == 0 && uc_fw->minor_ver_wanted == 0) {
-		DRM_NOTE("Skipping uC firmware version check\n");
+		DRM_NOTE("Skipping %s firmware version check\n",
+			 intel_uc_fw_type_repr(uc_fw->type));
 	} else if (uc_fw->major_ver_found != uc_fw->major_ver_wanted ||
 		   uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) {
-		DRM_NOTE("uC firmware version %d.%d, required %d.%d\n",
+		DRM_NOTE("%s firmware version %d.%d, required %d.%d\n",
+			 intel_uc_fw_type_repr(uc_fw->type),
 			 uc_fw->major_ver_found, uc_fw->minor_ver_found,
 			 uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);
 		err = -ENOEXEC;
diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h
index dfa0812..ace096b 100644
--- a/drivers/gpu/drm/i915/intel_uc.h
+++ b/drivers/gpu/drm/i915/intel_uc.h
@@ -192,6 +192,7 @@  struct intel_huc {
 
 /* intel_uc.c */
 const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status);
+const char *intel_uc_fw_type_repr(enum intel_uc_fw_type status);
 void intel_uc_sanitize_options(struct drm_i915_private *dev_priv);
 void intel_uc_init_early(struct drm_i915_private *dev_priv);
 void intel_uc_init_fw(struct drm_i915_private *dev_priv);