This field is used to determine which kind of firmware the struct describes (GuC/HuC) - the name does not reflect.
The enum used here have "type" in the name, so let's go with that. Cc: Tvrtko Ursulin <[email protected]> Cc: Oscar Mateo <[email protected]> Signed-off-by: Arkadiusz Hiler <[email protected]> --- drivers/gpu/drm/i915/intel_guc_loader.c | 2 +- drivers/gpu/drm/i915/intel_huc.c | 2 +- drivers/gpu/drm/i915/intel_uc.c | 4 ++-- drivers/gpu/drm/i915/intel_uc.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index d1d183b..2f270d0 100644 --- a/drivers/gpu/drm/i915/intel_guc_loader.c +++ b/drivers/gpu/drm/i915/intel_guc_loader.c @@ -405,7 +405,7 @@ int intel_guc_select_fw(struct intel_guc *guc) guc->fw.path = NULL; guc->fw.fetch_status = INTEL_UC_FIRMWARE_NONE; guc->fw.load_status = INTEL_UC_FIRMWARE_NONE; - guc->fw.fw = INTEL_UC_FW_TYPE_GUC; + guc->fw.type = INTEL_UC_FW_TYPE_GUC; if (i915.guc_firmware_path) { guc->fw.path = i915.guc_firmware_path; diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c index ab4ee08..7af900b 100644 --- a/drivers/gpu/drm/i915/intel_huc.c +++ b/drivers/gpu/drm/i915/intel_huc.c @@ -151,7 +151,7 @@ void intel_huc_select_fw(struct intel_huc *huc) huc->fw.path = NULL; huc->fw.fetch_status = INTEL_UC_FIRMWARE_NONE; huc->fw.load_status = INTEL_UC_FIRMWARE_NONE; - huc->fw.fw = INTEL_UC_FW_TYPE_HUC; + huc->fw.type = INTEL_UC_FW_TYPE_HUC; if (i915.huc_firmware_path) { huc->fw.path = i915.huc_firmware_path; diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index c31f05a..9671d14 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -331,7 +331,7 @@ void intel_uc_prepare_fw(struct drm_i915_private *dev_priv, * version are TWO bytes each (i.e. u16), although all pointers and * offsets are defined in terms of bytes (u8). */ - switch (uc_fw->fw) { + switch (uc_fw->type) { case INTEL_UC_FW_TYPE_GUC: /* Header and uCode will be loaded to WOPCM. Size of the two. */ size = uc_fw->header_size + uc_fw->ucode_size; @@ -351,7 +351,7 @@ void intel_uc_prepare_fw(struct drm_i915_private *dev_priv, break; default: - DRM_ERROR("Unknown firmware type %d\n", uc_fw->fw); + DRM_ERROR("Unknown firmware type %d\n", uc_fw->type); err = -ENOEXEC; goto fail; } diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h index 170dd70..a35eded 100644 --- a/drivers/gpu/drm/i915/intel_uc.h +++ b/drivers/gpu/drm/i915/intel_uc.h @@ -121,7 +121,7 @@ struct intel_uc_fw { uint16_t major_ver_found; uint16_t minor_ver_found; - enum intel_uc_fw_type fw; + enum intel_uc_fw_type type; uint32_t header_size; uint32_t header_offset; uint32_t rsa_size; -- 2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
