iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915/uc: Rename intel_uc_fw.fw to .type

Browse Source 
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 <tvrtko.ursulin@intel.com>
Cc: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170315133415.15343-1-arkadiusz.hiler@intel.com
This commit is contained in:
Arkadiusz Hiler 2017-03-15 14:34:15 +01:00 committed by Tvrtko Ursulin
parent a6b0a14128
commit 6833b82e98
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/intel_guc_loader.c
View File

@ -405,7 +405,7 @@ int intel_guc_select_fw(struct intel_guc *guc)
guc->fw.path = NULL; guc->fw.path = NULL;
guc->fw.fetch_status = INTEL_UC_FIRMWARE_NONE; guc->fw.fetch_status = INTEL_UC_FIRMWARE_NONE;
guc->fw.load_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) { if (i915.guc_firmware_path) {
guc->fw.path = i915.guc_firmware_path; guc->fw.path = i915.guc_firmware_path;

2
drivers/gpu/drm/i915/intel_huc.c
View File

@ -151,7 +151,7 @@ void intel_huc_select_fw(struct intel_huc *huc)
huc->fw.path = NULL; huc->fw.path = NULL;
huc->fw.fetch_status = INTEL_UC_FIRMWARE_NONE; huc->fw.fetch_status = INTEL_UC_FIRMWARE_NONE;
huc->fw.load_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) { if (i915.huc_firmware_path) {
huc->fw.path = i915.huc_firmware_path; huc->fw.path = i915.huc_firmware_path;

4
drivers/gpu/drm/i915/intel_uc.c
View File

@ -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 * version are TWO bytes each (i.e. u16), although all pointers and
* offsets are defined in terms of bytes (u8). * offsets are defined in terms of bytes (u8).
*/ */
switch (uc_fw->fw) { switch (uc_fw->type) {
case INTEL_UC_FW_TYPE_GUC: case INTEL_UC_FW_TYPE_GUC:
/* Header and uCode will be loaded to WOPCM. Size of the two. */ /* Header and uCode will be loaded to WOPCM. Size of the two. */
size = uc_fw->header_size + uc_fw->ucode_size; 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; break;
default: default:
DRM_ERROR("Unknown firmware type %d\n", uc_fw->fw); DRM_ERROR("Unknown firmware type %d\n", uc_fw->type);
err = -ENOEXEC; err = -ENOEXEC;
goto fail; goto fail;
} }

2
drivers/gpu/drm/i915/intel_uc.h
View File

@ -121,7 +121,7 @@ struct intel_uc_fw {
uint16_t major_ver_found; uint16_t major_ver_found;
uint16_t minor_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_size;
uint32_t header_offset; uint32_t header_offset;
uint32_t rsa_size; uint32_t rsa_size;