| Message ID | 20190906194757.10881-2-anusha.srivatsa@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/9] drm/i915/uc: Update MAKE_HUC_FW_PATH macro | expand |
On 9/6/19 12:47 PM, Anusha Srivatsa wrote: > Update MAKE_HUC_FW_PATH macro to follow the same convention > as the MAKE_GUC_FW_PATH with the separator changing from "_" to "." > and removing "ver". > > The current convention being: > <platform>_<g/h>uc_<major>.<minor>.patch.bin > > Suggested-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> > --- > drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > index 296a82603be0..16a5aa8fe15a 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > @@ -58,7 +58,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, > __MAKE_UC_FW_PATH(prefix_, "_guc_", ".", major_, minor_, patch_) > > #define MAKE_HUC_FW_PATH(prefix_, major_, minor_, bld_num_) \ > - __MAKE_UC_FW_PATH(prefix_, "_huc_ver", "_", major_, minor_, bld_num_) > + __MAKE_UC_FW_PATH(prefix_, "_huc_", ".", major_, minor_, bld_num_) Since the format is now the same between GuC and HuC we can stop passing the separator to __MAKE_UC_FW_PATH and just harcode "." in there. Daniele > > /* All blobs need to be declared via MODULE_FIRMWARE() */ > #define INTEL_UC_MODULE_FW(platform_, revid_, guc_, huc_) \ >
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c index 296a82603be0..16a5aa8fe15a 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c @@ -58,7 +58,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, __MAKE_UC_FW_PATH(prefix_, "_guc_", ".", major_, minor_, patch_) #define MAKE_HUC_FW_PATH(prefix_, major_, minor_, bld_num_) \ - __MAKE_UC_FW_PATH(prefix_, "_huc_ver", "_", major_, minor_, bld_num_) + __MAKE_UC_FW_PATH(prefix_, "_huc_", ".", major_, minor_, bld_num_) /* All blobs need to be declared via MODULE_FIRMWARE() */ #define INTEL_UC_MODULE_FW(platform_, revid_, guc_, huc_) \
Update MAKE_HUC_FW_PATH macro to follow the same convention as the MAKE_GUC_FW_PATH with the separator changing from "_" to "." and removing "ver". The current convention being: <platform>_<g/h>uc_<major>.<minor>.patch.bin Suggested-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> --- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)