From: Amber Lin <[email protected]>

MES in newer versions on gfx11 and gfx12 can support queue/pipe reset via
MES.

XXX: fix the version numbers when FW is complete

Signed-off-by: Amber Lin <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Reviewed-by: Jesse Zhang <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
index ec4d9a1e029a..c65f893815c5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
@@ -853,7 +853,11 @@ bool amdgpu_mes_suspend_resume_all_supported(struct 
amdgpu_device *adev)
 bool amdgpu_mes_queue_reset_by_mes_supported(struct amdgpu_device *adev)
 {
        return (amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(12, 1, 0) &&
-               (adev->mes.sched_version & AMDGPU_MES_VERSION_MASK) >= 0x73);
+                       (adev->mes.sched_version & AMDGPU_MES_VERSION_MASK) >= 
0x73) ||
+               (IP_VERSION_MAJ(amdgpu_ip_version(adev, GC_HWIP, 0)) == 11 &&
+                       (adev->mes.sched_version & AMDGPU_MES_VERSION_MASK) >= 
0x8a) ||
+               (amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(12, 0, 0) &&
+                       (adev->mes.sched_version & AMDGPU_MES_VERSION_MASK) >= 
0x8b);
 }
 
 /* Fix me -- node_id is used to identify the correct MES instances in the 
future */
-- 
2.49.0

Reply via email to