aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_device.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 36d00b20afa0..1f6121a2a94b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1936,6 +1936,9 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev)
1936 1936
1937 atomic_inc(&adev->gpu_reset_counter); 1937 atomic_inc(&adev->gpu_reset_counter);
1938 1938
1939 /* block TTM */
1940 resched = ttm_bo_lock_delayed_workqueue(&adev->mman.bdev);
1941
1939 /* block scheduler */ 1942 /* block scheduler */
1940 for (i = 0; i < AMDGPU_MAX_RINGS; ++i) { 1943 for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
1941 struct amdgpu_ring *ring = adev->rings[i]; 1944 struct amdgpu_ring *ring = adev->rings[i];
@@ -1945,8 +1948,6 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev)
1945 kthread_park(ring->sched.thread); 1948 kthread_park(ring->sched.thread);
1946 } 1949 }
1947 1950
1948 /* block TTM */
1949 resched = ttm_bo_lock_delayed_workqueue(&adev->mman.bdev);
1950 1951
1951 /* save scratch */ 1952 /* save scratch */
1952 amdgpu_atombios_scratch_regs_save(adev); 1953 amdgpu_atombios_scratch_regs_save(adev);