[AMD Official Use Only - AMD Internal Distribution Only] Acked-by: Alex Deucher <[email protected]> ________________________________ From: Yadav, Arvind <[email protected]> Sent: Friday, April 11, 2025 12:54 AM To: Yadav, Arvind <[email protected]>; Koenig, Christian <[email protected]>; Deucher, Alexander <[email protected]>; Khatri, Sunil <[email protected]>; Sharma, Shashank <[email protected]> Cc: [email protected] <[email protected]> Subject: Re: [PATCH 2/2 v2] drm/amdgpu: Add fw minimum version check for usermode queue
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 <[email protected]> > Cc: Christian Koenig <[email protected]> > Cc: Shashank Sharma <[email protected]> > Cc: Sunil Khatri <[email protected]> > Signed-off-by: Arvind Yadav <[email protected]> > --- > 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 */ > - 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; > }
