drm/amdgpu: update firmware version checks for user queue support

commit ee38ea0ae4ed13fe33e033dc98d11e76bc7167cd upstream.

The minimum firmware versions required for user queue functionality
have been increased to address an issue where the queue privilege
state was lost during queue connect operations.

The problem occurred because the privilege state was being restored
to its initial value at the beginning of the function, overwriting
the state that was properly set during the queue connect case.

This commit updates the minimum version requirements:
- ME firmware from 2390 to 2420
- PFP firmware from 2530 to 2580
- MEC firmware from 2600 to 2650
- MES firmware remains at 120

These updated firmware versions contain the necessary fixes to
properly maintain queue privilege state throughout connect operations.

Fixes: 61ca97e9590c ("drm/amdgpu: Add fw minimum version check for usermode queue")
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Jesse Zhang <Jesse.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 5f976c9939f0d5916d2b8ef3156a6d1799781df1)
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
index e632e97d63be0277238132aed60df48c4176e242..1fd992a0ff432a6597efbdd0b63aca814363b406 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
@@ -1612,9 +1612,9 @@ static int gfx_v11_0_sw_init(struct amdgpu_ip_block *ip_block)
        case IP_VERSION(11, 0, 2):
        case IP_VERSION(11, 0, 3):
                if (!adev->gfx.disable_uq &&
-                   adev->gfx.me_fw_version  >= 2390 &&
-                   adev->gfx.pfp_fw_version >= 2530 &&
-                   adev->gfx.mec_fw_version >= 2600 &&
+                   adev->gfx.me_fw_version  >= 2420 &&
+                   adev->gfx.pfp_fw_version >= 2580 &&
+                   adev->gfx.mec_fw_version >= 2650 &&
                    adev->mes.fw_version[0] >= 120) {
                        adev->userq_funcs[AMDGPU_HW_IP_GFX] = &userq_mes_funcs;
                        adev->userq_funcs[AMDGPU_HW_IP_COMPUTE] = &userq_mes_funcs;