| Message ID | 20170315133415.15343-1-arkadiusz.hiler@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Mar 15, 2017 at 02:34:15PM +0100, Arkadiusz Hiler wrote: > 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> -Michal
On 15/03/2017 14:17, Patchwork wrote: > == Series Details == > > Series: drm/i915/uc: Rename intel_uc_fw.fw to .type > URL : https://patchwork.freedesktop.org/series/21285/ > State : success > > == Summary == > > Series 21285v1 drm/i915/uc: Rename intel_uc_fw.fw to .type > https://patchwork.freedesktop.org/api/1.0/series/21285/revisions/1/mbox/ > > Test gem_exec_flush: > Subgroup basic-batch-kernel-default-uc: > fail -> PASS (fi-snb-2600) fdo#100007 > Test kms_force_connector_basic: > Subgroup prune-stale-modes: > skip -> PASS (fi-snb-2600) > > fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007 > > fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 455s > fi-bsw-n3050 total:278 pass:239 dwarn:0 dfail:0 fail:0 skip:39 time: 573s > fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 537s > fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time: 555s > fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 time: 505s > fi-byt-n2820 total:278 pass:247 dwarn:0 dfail:0 fail:0 skip:31 time: 502s > fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 441s > fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 516s > fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 492s > fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 479s > fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 491s > fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 492s > fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 528s > fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 548s > fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time: 415s > > 25f04730646ed8f7bc59e9e9d1cc9b4c9ecbc09d drm-tip: 2017y-03m-15d-12h-56m-15s UTC integration manifest > 419047b drm/i915/uc: Rename intel_uc_fw.fw to .type Pushed, thanks for the patch and review! Regards, Tvrtko
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;
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> --- 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(-)