From: Jack Xiao <Jack.Xiao@amd.com>
Date: Tue, 21 May 2024 07:28:17 +0000 (+0800)
Subject: drm/amdgpu/mes12: mes hw_fini fix for mode1 reset
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fa1040811678afc0fad043d7be1de252de74a035;p=users%2Fjedix%2Flinux-maple.git

drm/amdgpu/mes12: mes hw_fini fix for mode1 reset

Port mes11 hw_fini to mes12, fix for mode1 reset.

Signed-off-by: Jack Xiao <Jack.Xiao@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
index 45b70a4c4ada..f18fdda023c9 100644
--- a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
@@ -1380,11 +1380,12 @@ failure:
 
 static int mes_v12_0_kiq_hw_fini(struct amdgpu_device *adev)
 {
-	if (!adev->enable_uni_mes && adev->mes.ring.sched.ready)
+	if (adev->mes.ring.sched.ready) {
 		mes_v12_0_kiq_dequeue_sched(adev);
+		adev->mes.ring.sched.ready = false;
+	}
 
-	if (!amdgpu_sriov_vf(adev))
-		mes_v12_0_enable(adev, false);
+	mes_v12_0_enable(adev, false);
 
 	return 0;
 }