artulab
projects
/
openbsd
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a1b9fa
)
drm/amdgpu: skip mes self test after s0i3 resume for MES IP v11.0
author
jsg
<jsg@openbsd.org>
Mon, 9 Jan 2023 04:01:17 +0000
(
04:01
+0000)
committer
jsg
<jsg@openbsd.org>
Mon, 9 Jan 2023 04:01:17 +0000
(
04:01
+0000)
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
patch
|
blob
|
history
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
d1b9e31
..
c304d75
100644
(file)
--- 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);