[PATCH 0/2] Initial GuC firmware release for DG2

[PATCH 0/2] Initial GuC firmware release for DG2

[John.C.Harrison]

From: John Harrison <John.C.Harrison@Intel.com>

Add GuC firmware for DG2.

Note that an older version of this patch exists in the CI topic
branch. Hence this set includes a revert of that patch before applying
the new version. When merging, the revert would simply be dropped and
the corresponding patch in the topic branch would also be dropped.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>


John Harrison (2):
  Revert "drm/i915/dg2: Define GuC firmware version for DG2"
  drm/i915/dg2: Define GuC firmware version for DG2

 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.25.1

[PATCH 1/2] Revert "drm/i915/dg2: Define GuC firmware version for DG2"

[John.C.Harrison]

From: John Harrison <John.C.Harrison@Intel.com>

This reverts commit 55c7f980e48e56861496526e02ed5bbfdac49ede.

The CI topic branch within drm-top contains an old patch for
supporting GuC on DG2. That needs to be dropped and an updated patch
merged to drm-gt-next. Hence this patch reverts it so the new patch
can be sent in it's correct form for CI testing.

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 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 cb5dd16421d0..a876d39e6bcf 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -53,7 +53,6 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
  * firmware as TGL.
  */
 #define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_def) \
-	fw_def(DG2,          0, guc_def(dg2,  70, 1, 1)) \
 	fw_def(ALDERLAKE_P,  0, guc_def(adlp, 70, 1, 1)) \
 	fw_def(ALDERLAKE_S,  0, guc_def(tgl,  70, 1, 1)) \
 	fw_def(DG1,          0, guc_def(dg1,  70, 1, 1)) \
-- 
2.25.1

[PATCH 2/2] drm/i915/dg2: Define GuC firmware version for DG2

[John.C.Harrison]

From: John Harrison <John.C.Harrison@Intel.com>

First release of GuC for DG2.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
CC: Tomasz Mistat <tomasz.mistat@intel.com>
CC: Ramalingam C <ramalingam.c@intel.com>
CC: Daniele Ceraolo Spurio <daniele.ceraolospurio@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 a876d39e6bcf..d078f884b5e3 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -53,6 +53,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
  * firmware as TGL.
  */
 #define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_def) \
+	fw_def(DG2,          0, guc_def(dg2,  70, 1, 2)) \
 	fw_def(ALDERLAKE_P,  0, guc_def(adlp, 70, 1, 1)) \
 	fw_def(ALDERLAKE_S,  0, guc_def(tgl,  70, 1, 1)) \
 	fw_def(DG1,          0, guc_def(dg1,  70, 1, 1)) \
-- 
2.25.1

Re: [PATCH 2/2] drm/i915/dg2: Define GuC firmware version for DG2

[Ceraolo Spurio, Daniele]

On 4/27/2022 9:55 AM, John.C.Harrison@Intel.com wrote:
> From: John Harrison <John.C.Harrison@Intel.com>
>
> First release of GuC for DG2.

Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>

Daniele

>
> Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
> CC: Tomasz Mistat <tomasz.mistat@intel.com>
> CC: Ramalingam C <ramalingam.c@intel.com>
> CC: Daniele Ceraolo Spurio <daniele.ceraolospurio@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 a876d39e6bcf..d078f884b5e3 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> @@ -53,6 +53,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
>    * firmware as TGL.
>    */
>   #define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_def) \
> +	fw_def(DG2,          0, guc_def(dg2,  70, 1, 2)) \
>   	fw_def(ALDERLAKE_P,  0, guc_def(adlp, 70, 1, 1)) \
>   	fw_def(ALDERLAKE_S,  0, guc_def(tgl,  70, 1, 1)) \
>   	fw_def(DG1,          0, guc_def(dg1,  70, 1, 1)) \

Re: [Intel-gfx] [PATCH 0/2] Initial GuC firmware release for DG2

[Timo Aaltonen]

John.C.Harrison@Intel.com kirjoitti 27.4.2022 klo 19.55:
> From: John Harrison <John.C.Harrison@Intel.com>
> 
> Add GuC firmware for DG2.
> 
> Note that an older version of this patch exists in the CI topic
> branch. Hence this set includes a revert of that patch before applying
> the new version. When merging, the revert would simply be dropped and
> the corresponding patch in the topic branch would also be dropped.
> 
> Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
> 
> 
> John Harrison (2):
>    Revert "drm/i915/dg2: Define GuC firmware version for DG2"
>    drm/i915/dg2: Define GuC firmware version for DG2
> 
>   drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 

The firmware is not public yet, though? Shouldn't it have been sent 
upstream already? Same complaint applies to DMC.


-- 
t

Re: [Intel-gfx] [PATCH 0/2] Initial GuC firmware release for DG2

[John Harrison]

On 4/27/2022 11:24, Timo Aaltonen wrote:
> John.C.Harrison@Intel.com kirjoitti 27.4.2022 klo 19.55:
>> From: John Harrison <John.C.Harrison@Intel.com>
>>
>> Add GuC firmware for DG2.
>>
>> Note that an older version of this patch exists in the CI topic
>> branch. Hence this set includes a revert of that patch before applying
>> the new version. When merging, the revert would simply be dropped and
>> the corresponding patch in the topic branch would also be dropped.
>>
>> Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
>>
>>
>> John Harrison (2):
>>    Revert "drm/i915/dg2: Define GuC firmware version for DG2"
>>    drm/i915/dg2: Define GuC firmware version for DG2
>>
>>   drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>
> The firmware is not public yet, though? Shouldn't it have been sent 
> upstream already? Same complaint applies to DMC.
>
>
Not sure about the DMC team, but for i915 we upload the firmware to an 
FDO repo so that the CI system can find it and run the pre-merge testing 
with it. However, we don't send the final pull request for the real 
linux firmware repo until we have merged the i915 patch to 
drm-gt-intel-next and it is definitely going upstream. Otherwise, we 
might end up pushing firmwares to the linux repo that never get used.

John.

Re: [Intel-gfx] [PATCH 0/2] Initial GuC firmware release for DG2

[Lucas De Marchi]

On Wed, Apr 27, 2022 at 03:14:16PM -0700, John Harrison wrote:
>On 4/27/2022 11:24, Timo Aaltonen wrote:
>>John.C.Harrison@Intel.com kirjoitti 27.4.2022 klo 19.55:
>>>From: John Harrison <John.C.Harrison@Intel.com>
>>>
>>>Add GuC firmware for DG2.
>>>
>>>Note that an older version of this patch exists in the CI topic
>>>branch. Hence this set includes a revert of that patch before applying
>>>the new version. When merging, the revert would simply be dropped and
>>>the corresponding patch in the topic branch would also be dropped.
>>>
>>>Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
>>>
>>>
>>>John Harrison (2):
>>>   Revert "drm/i915/dg2: Define GuC firmware version for DG2"
>>>   drm/i915/dg2: Define GuC firmware version for DG2
>>>
>>>  drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>
>>The firmware is not public yet, though? Shouldn't it have been sent 
>>upstream already? Same complaint applies to DMC.
>>
>>
>Not sure about the DMC team, but for i915 we upload the firmware to an 
>FDO repo so that the CI system can find it and run the pre-merge 
>testing with it. However, we don't send the final pull request for the 
>real linux firmware repo until we have merged the i915 patch to 
>drm-gt-intel-next and it is definitely going upstream. Otherwise, we 
>might end up pushing firmwares to the linux repo that never get used.

we don't want to risk sending a pull request to drm if the firmware is
not in linux-firmware repo yet though, so we need to be careful with
this workflow.

We still have some weeks, which should be sufficient time if it's sent
to linux-firmware asap.

2nd patch pushed to drm-intel-gt-next.
1st patch I removed from topic/core-for-CI.

Thanks
Lucas De Marchi

>
>John.
>