[PATCH 0/2] drm/xe: Support different GuCs per GT

[Lucas De Marchi]

On Thu, Mar 20, 2025 at 01:09:36PM -0700, John Harrison wrote:
>On 3/7/2025 10:13 AM, Lucas De Marchi wrote:
>>This is an alternative approach to what John sent at
>>https://lore.kernel.org/intel-xe/20250303195215.1046192-1-John.C.Harrison@Intel.com/
>>
>>Main thing is not making the name of the firmware magic, depending on
>>part of starting with "g" or "m". So here I add the gt type in a
>>pahole-friendly way and use it in the tables.
>>
>>Tested on BMG with the following table, just for tests:
>>
>>	fw_def(PANTHERLAKE,     GT_TYPE_ANY,    mmp_ver(xe,     guc,    ptl,    70, 38, 1))     \
>>	fw_def(BATTLEMAGE,      GT_TYPE_MEDIA,  mmp_ver(xe,     guc,    bmg,    70, 40, 2))     \
>>	fw_def(BATTLEMAGE,      GT_TYPE_ANY,    major_ver(xe,   guc,    bmg,    70, 29, 2))     \
>Longer lines, but otherwise seems like a better way of doing it.
>
>PS: Sorry for taking so long on the review, lots going on lately!
>
>>	...
>>
>>And with that I get (pasting just the relevant parts:
>>
>>	xe 0000:03:00.0: [drm] Using GuC firmware from xe/bmg_guc_70.bin version 70.36.0
>>	xe 0000:03:00.0: [drm:xe_guc_ct_enable [xe]] GT0: GuC CT communication channel enabled
>>	xe 0000:03:00.0: [drm] Using GuC firmware from xe/bmg_guc_70.40.2.bin version 70.40.2
>>	xe 0000:03:00.0: [drm:xe_guc_ct_enable [xe]] GT1: GuC CT communication channel enabled
>>
>>Something that we could also discuss is getting rid of the macro
>>indirections and just type the name of the file. Once upon a time we
>>needed to use different dirs, but now this only matters per for the file
>>name. The only repetition would be probably on the version. But I think
>>it would make it clearer what files we expect to have without the macro
>>indirections.
>Not convinced about that plan. Having the filename auto-generated from 
>specific fields ensures the format is correct. And duplicating the 
>version number seems wasteful.

yeah... we can leave this for later/never.

Thanks for the review. Pushed to drm-xe-next and rebased topic/xe-for-CI
on top.

Lucas De Marchi

>
>John.
>
>>
>>Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
>>---
>>Lucas De Marchi (2):
>>       drm/xe/uc: Remove static from loop variable
>>       drm/xe/uc: Add support for different firmware files on each GT
>>
>>  drivers/gpu/drm/xe/xe_uc_fw.c | 102 ++++++++++++++++++++++++------------------
>>  1 file changed, 59 insertions(+), 43 deletions(-)
>>---
>>base-commit: 2c4fba1d065427efba4aaed5f80f4664c9f4a729
>>change-id: 20250307-xe-per-gt-fw-4938dff9b339
>>
>>Best regards,
>