diff options
| author |   jsg <jsg@openbsd.org> | 2020-08-22 06:26:38 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2020-08-22 06:26:38 +0000 |
| commit | 4aa0689a8b9ea585a11cb6cba6364c11464a4124 (patch) | |
| tree | a19070e792b55884553a8a5a202a9e1757f269dd | |
| parent | drm/dp_mst: Fix the DDC I2C device registration of an MST port (diff) | |
| download | wireguard-openbsd-4aa0689a8b9ea585a11cb6cba6364c11464a4124.tar.xz wireguard-openbsd-4aa0689a8b9ea585a11cb6cba6364c11464a4124.zip | |
drm/amdgpu: fix ordering of psp suspend
From Alex Deucher
d0b3df5fdc668c07bb47cb3082124eb823066141 in linux 5.7.y/5.7.17
| -rw-r--r-- | sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c index e5caa84336a..cf960fc34ab 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c @@ -1679,15 +1679,15 @@ static int psp_suspend(void *handle) } } - ret = psp_tmr_terminate(psp); + ret = psp_asd_unload(psp); if (ret) { - DRM_ERROR("Falied to terminate tmr\n"); + DRM_ERROR("Failed to unload asd\n"); return ret; } - ret = psp_asd_unload(psp); + ret = psp_tmr_terminate(psp); if (ret) { - DRM_ERROR("Failed to unload asd\n"); + DRM_ERROR("Falied to terminate tmr\n"); return ret; } |