diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-01-09 04:01:18 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-01-09 04:01:18 +0000 |
| commit | 49d14f7589a4d80c8c2e5e5e0f5614caf1725c8a (patch) | |
| tree | 724dcb2d8702e14b6b12a3d3cd31ffc482924ebe /sys | |
| parent | bb5a71ff050f99a0e421b6b0e67f68d8f3d3e785 (diff) | |
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
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/drm/amd/amdgpu/mes_v11_0.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |