drm/i915/uc: Move intel_uc_fw_status_repr() to intel_uc.h
Subsystems (2)
PATCH v2 1/5 drm/i915/uc: Move intel_uc_fw_status_repr() to intel_uc.h
The file fits better. Also use "<invalid>" for invalid case.
v2: move directly to .h (Joonas)
Signed-off-by Michal Wajdeczko <[email protected]>
Cc Arkadiusz Hiler <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Reviewed-by Joonas Lahtinen <[email protected]>
--- drivers/gpu/drm/i915/intel_guc_loader.c | 16 ---------------- drivers/gpu/drm/i915/intel_uc.h | 20 +++++++++++++++++++- 2 files changed, 19 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +0 -16
@@ -73,22 +73,6 @@ MODULE_FIRMWARE(I915_BXT_GUC_UCODE);#define I915_KBL_GUC_UCODE GUC_FW_PATH(kbl, KBL_FW_MAJOR, KBL_FW_MINOR)MODULE_FIRMWARE (I915_KBL_GUC_UCODE ); -/* User-friendly representation of an enum */ -const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status) -{ -switch (status) { -case INTEL_UC_FIRMWARE_FAIL : -return "FAIL" ; -case INTEL_UC_FIRMWARE_NONE : -return "NONE" ; -case INTEL_UC_FIRMWARE_PENDING : -return "PENDING" ; -case INTEL_UC_FIRMWARE_SUCCESS : -return "SUCCESS" ; -default : -return "UNKNOWN!" ; - } -};static u32 get_gttype (struct drm_i915_private *dev_priv) {
drivers/gpu/drm/i915/intel_uc.h +19 -1
@@ -101,6 +101,25 @@ enum intel_uc_fw_status {INTEL_UC_FIRMWARE_SUCCESS }; +/* User-friendly representation of an enum */ +static inline +const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status) +{ +switch (status) { +case INTEL_UC_FIRMWARE_FAIL : +return "FAIL" ; +case INTEL_UC_FIRMWARE_NONE : +return "NONE" ; +case INTEL_UC_FIRMWARE_PENDING : +return "PENDING" ; +case INTEL_UC_FIRMWARE_SUCCESS : +return "SUCCESS" ; +default : +MISSING_CASE (status); +return "<invalid>" ; + } +} +enum intel_uc_fw_type {INTEL_UC_FW_TYPE_GUC ,INTEL_UC_FW_TYPE_HUC
@@ -207,7 +226,6 @@ static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 l/* intel_guc_loader.c */ int intel_guc_select_fw (struct intel_guc *guc);int intel_guc_init_hw (struct intel_guc *guc); -const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);int intel_guc_suspend (struct drm_i915_private *dev_priv);int intel_guc_resume (struct drm_i915_private *dev_priv);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx