* [PATCH 0/2] Update to new HuC for TGL+ and enable GuC/HuC on ADL-P
@ 2021-06-26 0:45 John.C.Harrison
2021-06-26 0:45 ` [PATCH 1/2] drm/i915/huc: Update TGL and friends to HuC 7.9.3 John.C.Harrison
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: John.C.Harrison @ 2021-06-26 0:45 UTC (permalink / raw)
To: Intel-GFX; +Cc: John Harrison, DRI-Devel
From: John Harrison <John.C.Harrison@Intel.com>
There is a new HuC version available for TGL and compatible platforms,
so switch to using it. Also, there is now a GuC and HuC for ADL-P, so
use those too.
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
John Harrison (2):
drm/i915/huc: Update TGL and friends to HuC 7.9.3
drm/i915/adlp: Add ADL-P GuC/HuC firmware files
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] drm/i915/huc: Update TGL and friends to HuC 7.9.3 2021-06-26 0:45 [PATCH 0/2] Update to new HuC for TGL+ and enable GuC/HuC on ADL-P John.C.Harrison @ 2021-06-26 0:45 ` John.C.Harrison 2021-07-06 23:50 ` Daniele Ceraolo Spurio 2021-06-26 0:45 ` [PATCH 2/2] drm/i915/adlp: Add ADL-P GuC/HuC firmware files John.C.Harrison 2021-07-07 9:52 ` [PATCH 0/2] Update to new HuC for TGL+ and enable GuC/HuC on ADL-P Michal Wajdeczko 2 siblings, 1 reply; 6+ messages in thread From: John.C.Harrison @ 2021-06-26 0:45 UTC (permalink / raw) To: Intel-GFX; +Cc: John Harrison, DRI-Devel From: John Harrison <John.C.Harrison@Intel.com> A new HuC is available for TGL and compatible platforms, so switch to using it. Signed-off-by: John Harrison <John.C.Harrison@Intel.com> --- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 9f23e9de3237..f05b1572e3c3 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c @@ -48,9 +48,9 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, * firmware as TGL. */ #define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \ - fw_def(ALDERLAKE_S, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 5, 0)) \ - fw_def(ROCKETLAKE, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 5, 0)) \ - fw_def(TIGERLAKE, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 5, 0)) \ + fw_def(ALDERLAKE_S, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 9, 3)) \ + fw_def(ROCKETLAKE, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 9, 3)) \ + fw_def(TIGERLAKE, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 9, 3)) \ fw_def(JASPERLAKE, 0, guc_def(ehl, 62, 0, 0), huc_def(ehl, 9, 0, 0)) \ fw_def(ELKHARTLAKE, 0, guc_def(ehl, 62, 0, 0), huc_def(ehl, 9, 0, 0)) \ fw_def(ICELAKE, 0, guc_def(icl, 62, 0, 0), huc_def(icl, 9, 0, 0)) \ -- 2.25.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] drm/i915/huc: Update TGL and friends to HuC 7.9.3 2021-06-26 0:45 ` [PATCH 1/2] drm/i915/huc: Update TGL and friends to HuC 7.9.3 John.C.Harrison @ 2021-07-06 23:50 ` Daniele Ceraolo Spurio 0 siblings, 0 replies; 6+ messages in thread From: Daniele Ceraolo Spurio @ 2021-07-06 23:50 UTC (permalink / raw) To: John.C.Harrison, Intel-GFX; +Cc: DRI-Devel Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Daniele On 6/25/2021 5:45 PM, John.C.Harrison@Intel.com wrote: > From: John Harrison <John.C.Harrison@Intel.com> > > A new HuC is available for TGL and compatible platforms, so switch to > using it. > > Signed-off-by: John Harrison <John.C.Harrison@Intel.com> > --- > drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > 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 9f23e9de3237..f05b1572e3c3 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > @@ -48,9 +48,9 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, > * firmware as TGL. > */ > #define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \ > - fw_def(ALDERLAKE_S, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 5, 0)) \ > - fw_def(ROCKETLAKE, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 5, 0)) \ > - fw_def(TIGERLAKE, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 5, 0)) \ > + fw_def(ALDERLAKE_S, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 9, 3)) \ > + fw_def(ROCKETLAKE, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 9, 3)) \ > + fw_def(TIGERLAKE, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 9, 3)) \ > fw_def(JASPERLAKE, 0, guc_def(ehl, 62, 0, 0), huc_def(ehl, 9, 0, 0)) \ > fw_def(ELKHARTLAKE, 0, guc_def(ehl, 62, 0, 0), huc_def(ehl, 9, 0, 0)) \ > fw_def(ICELAKE, 0, guc_def(icl, 62, 0, 0), huc_def(icl, 9, 0, 0)) \ ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] drm/i915/adlp: Add ADL-P GuC/HuC firmware files 2021-06-26 0:45 [PATCH 0/2] Update to new HuC for TGL+ and enable GuC/HuC on ADL-P John.C.Harrison 2021-06-26 0:45 ` [PATCH 1/2] drm/i915/huc: Update TGL and friends to HuC 7.9.3 John.C.Harrison @ 2021-06-26 0:45 ` John.C.Harrison 2021-07-06 23:54 ` Daniele Ceraolo Spurio 2021-07-07 9:52 ` [PATCH 0/2] Update to new HuC for TGL+ and enable GuC/HuC on ADL-P Michal Wajdeczko 2 siblings, 1 reply; 6+ messages in thread From: John.C.Harrison @ 2021-06-26 0:45 UTC (permalink / raw) To: Intel-GFX; +Cc: John Harrison, DRI-Devel From: John Harrison <John.C.Harrison@Intel.com> Add ADL-P to the list of supported GuC and HuC firmware versions. For HuC, it reuses the existing TGL firmware file. For GuC, there is a dedicated firmware release. Signed-off-by: John Harrison <John.C.Harrison@Intel.com> --- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 + 1 file changed, 1 insertion(+) 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 f05b1572e3c3..3a16d08608a5 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c @@ -48,6 +48,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, * firmware as TGL. */ #define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \ + fw_def(ALDERLAKE_P, 0, guc_def(adlp, 62, 0, 3), huc_def(tgl, 7, 9, 3)) \ fw_def(ALDERLAKE_S, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 9, 3)) \ fw_def(ROCKETLAKE, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 9, 3)) \ fw_def(TIGERLAKE, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 9, 3)) \ -- 2.25.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/i915/adlp: Add ADL-P GuC/HuC firmware files 2021-06-26 0:45 ` [PATCH 2/2] drm/i915/adlp: Add ADL-P GuC/HuC firmware files John.C.Harrison @ 2021-07-06 23:54 ` Daniele Ceraolo Spurio 0 siblings, 0 replies; 6+ messages in thread From: Daniele Ceraolo Spurio @ 2021-07-06 23:54 UTC (permalink / raw) To: John.C.Harrison, Intel-GFX; +Cc: DRI-Devel On 6/25/2021 5:45 PM, John.C.Harrison@Intel.com wrote: > From: John Harrison <John.C.Harrison@Intel.com> > > Add ADL-P to the list of supported GuC and HuC firmware versions. For > HuC, it reuses the existing TGL firmware file. For GuC, there is a > dedicated firmware release. > > Signed-off-by: John Harrison <John.C.Harrison@Intel.com> > --- > drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 + > 1 file changed, 1 insertion(+) > > 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 f05b1572e3c3..3a16d08608a5 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > @@ -48,6 +48,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, > * firmware as TGL. > */ > #define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \ > + fw_def(ALDERLAKE_P, 0, guc_def(adlp, 62, 0, 3), huc_def(tgl, 7, 9, 3)) \ Kind of annoying that the guc adlp prefix isn't a 3 letter acronym, but I can see using just adl could be confusing given that ADL-S uses a different firmware. Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Daniele > fw_def(ALDERLAKE_S, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 9, 3)) \ > fw_def(ROCKETLAKE, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 9, 3)) \ > fw_def(TIGERLAKE, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl, 7, 9, 3)) \ ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] Update to new HuC for TGL+ and enable GuC/HuC on ADL-P 2021-06-26 0:45 [PATCH 0/2] Update to new HuC for TGL+ and enable GuC/HuC on ADL-P John.C.Harrison 2021-06-26 0:45 ` [PATCH 1/2] drm/i915/huc: Update TGL and friends to HuC 7.9.3 John.C.Harrison 2021-06-26 0:45 ` [PATCH 2/2] drm/i915/adlp: Add ADL-P GuC/HuC firmware files John.C.Harrison @ 2021-07-07 9:52 ` Michal Wajdeczko 2 siblings, 0 replies; 6+ messages in thread From: Michal Wajdeczko @ 2021-07-07 9:52 UTC (permalink / raw) To: John.C.Harrison, Intel-GFX; +Cc: DRI-Devel Hi John, On 26.06.2021 02:45, John.C.Harrison@Intel.com wrote: > From: John Harrison <John.C.Harrison@Intel.com> > > There is a new HuC version available for TGL and compatible platforms, > so switch to using it. Also, there is now a GuC and HuC for ADL-P, so > use those too. I recall discussion about splitting UC_FW meta macro into two: one for GUC firmwares and other for HUC firmwares - what happen to this idea? Maybe we can do it in this series as a first step ? then changing just HuC version will be limited to HUC meta macro only. Michal > > Signed-off-by: John Harrison <John.C.Harrison@Intel.com> > > > John Harrison (2): > drm/i915/huc: Update TGL and friends to HuC 7.9.3 > drm/i915/adlp: Add ADL-P GuC/HuC firmware files > > drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-07-07 9:52 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-06-26 0:45 [PATCH 0/2] Update to new HuC for TGL+ and enable GuC/HuC on ADL-P John.C.Harrison 2021-06-26 0:45 ` [PATCH 1/2] drm/i915/huc: Update TGL and friends to HuC 7.9.3 John.C.Harrison 2021-07-06 23:50 ` Daniele Ceraolo Spurio 2021-06-26 0:45 ` [PATCH 2/2] drm/i915/adlp: Add ADL-P GuC/HuC firmware files John.C.Harrison 2021-07-06 23:54 ` Daniele Ceraolo Spurio 2021-07-07 9:52 ` [PATCH 0/2] Update to new HuC for TGL+ and enable GuC/HuC on ADL-P Michal Wajdeczko
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).