[PATCH 2/2 v2] drm/amdgpu: Add fw minimum version check for usermode queue

[Pierre-Eric Pelloux-Prayer]

Hi,

Le 11/04/2025 à 06:54, Yadav, Arvind a écrit :
> Alex,
> This is v2 of 2/2 patch. Please review this.
> 
> ~arvind
> 
> On 4/10/2025 8:27 PM, Arvind Yadav wrote:
>> This patch is load usermode queue based on FW support for gfx12.
>> CP Ucode FW Vesion: [PFP = 2840, ME = 2780, MEC = 3050, MES = 123]
>>
>> v2: Addressed review comments from Alex
>>     - Just check the firmware versions directly.
>>
>> Cc: Alex Deucher <alexander.deucher at amd.com>
>> Cc: Christian Koenig <christian.koenig at amd.com>
>> Cc: Shashank Sharma <shashank.sharma at amd.com>
>> Cc: Sunil Khatri <sunil.khatri at amd.com>
>> Signed-off-by: Arvind Yadav <Arvind.Yadav at amd.com>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 5 ++++-
>>   1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
>> index 3d87e445270e..3165fdfeca6a 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
>> @@ -1418,7 +1418,10 @@ static int gfx_v12_0_sw_init(struct amdgpu_ip_block *ip_block)
>>       case IP_VERSION(12, 0, 1):
>>   #ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ
>>           /* add firmware version checks here */

This comment could be removed now that you implemented the version checks (the same remark applies 
to patch 1/2).

Regards,
Pierre-eric

>> -        if (0) {
>> +        if (adev->gfx.me_fw_version  >= 2780 &&
>> +            adev->gfx.pfp_fw_version >= 2840 &&
>> +            adev->gfx.mec_fw_version >= 3050 &&
>> +            adev->mes.fw_version[0] >= 123) {
>>               adev->userq_funcs[AMDGPU_HW_IP_GFX] = &userq_mes_funcs;
>>               adev->userq_funcs[AMDGPU_HW_IP_COMPUTE] = &userq_mes_funcs;
>>           }