From 6e5a0d2a25408016cbec5443ab217eb3c9e41052 Mon Sep 17 00:00:00 2001 From: jsg Date: Mon, 9 Jan 2023 04:01:17 +0000 Subject: [PATCH] drm/amdgpu: skip mes self test after s0i3 resume for MES IP v11.0 From Tim Huang a354a9e3fc3b5475b80395a3015644e26352223f in linux-6.1.y/6.1.4 8660495a9c5b9afeec4cc006b3b75178f0fb2f10 in mainline linux --- sys/dev/pci/drm/amd/amdgpu/mes_v11_0.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/drm/amd/amdgpu/mes_v11_0.c b/sys/dev/pci/drm/amd/amdgpu/mes_v11_0.c index d1b9e318b55..c304d75e7d7 100644 --- a/sys/dev/pci/drm/amd/amdgpu/mes_v11_0.c +++ b/sys/dev/pci/drm/amd/amdgpu/mes_v11_0.c @@ -1339,7 +1339,8 @@ static int mes_v11_0_late_init(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; - if (!amdgpu_in_reset(adev) && + /* it's only intended for use in mes_self_test case, not for s0ix and reset */ + if (!amdgpu_in_reset(adev) && !adev->in_s0ix && (adev->ip_versions[GC_HWIP][0] != IP_VERSION(11, 0, 3))) amdgpu_mes_self_test(adev); -- 2.20.1