[PATCH 1/3] drm/xe: Drop pre-release GuC definitions for LNL and BMG

[Daniele Ceraolo Spurio]

On 7/26/2024 6:57 AM, Lucas De Marchi wrote:
> On Thu, Jul 25, 2024 at 06:26:08PM GMT, Daniele Ceraolo Spurio wrote:
>> Now that we have the binaries ready to go to linux-firmware, we can
>> remove the pre-release definitions as a prep step to add the final
>> defines in drm-xe-next.
>>
>> Note that this patch is meant to be squashed with the patch in
>> xe-for-CI that adds the definitions
>> ("drm/xe/guc: Pre-release GuC firmware v70.24.0 for LNL/BMG/PVC"). We
>> can't just drop that patch because we want to keep the PVC FW def.
>>
>> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
>
> while applying it, can you reword the commit message so the remaining
> commit is just about PVC?

Sure. I was already planning to do that, I should've probably made it 
clearer in the commit message.

>
> Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

Thanks!
Daniele

>
> thanks
> Lucas De Marchi
>
>> ---
>> drivers/gpu/drm/xe/xe_uc_fw.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c 
>> b/drivers/gpu/drm/xe/xe_uc_fw.c
>> index 6b92255a769d..c0ff44e0b0ea 100644
>> --- a/drivers/gpu/drm/xe/xe_uc_fw.c
>> +++ b/drivers/gpu/drm/xe/xe_uc_fw.c
>> @@ -105,8 +105,7 @@ struct fw_blobs_by_type {
>> };
>>
>> #define XE_GUC_FIRMWARE_DEFS(fw_def, mmp_ver, major_ver)            \
>> -    fw_def(BATTLEMAGE,    major_ver(intel-ci/xe,    guc, bmg,    70, 
>> 24, 0))    \
>> -    fw_def(LUNARLAKE,    major_ver(intel-ci/xe,    guc, lnl,    70, 
>> 24, 0))    \
>> +    fw_def(LUNARLAKE,    major_ver(xe,    guc,    lnl,    70, 19, 
>> 2))    \
>>     fw_def(METEORLAKE,    major_ver(i915,    guc,    mtl,    70, 19, 
>> 2))    \
>>     fw_def(PVC,        mmp_ver(intel-ci/xe, guc, pvc,    70, 24, 
>> 0))    \
>>     fw_def(DG2,        major_ver(i915,    guc,    dg2,    70, 19, 
>> 2))    \
>> -- 
>> 2.43.0
>>