aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
diff options
context:
space:
mode:
authorMonk Liu <Monk.Liu@amd.com>2017-10-16 02:38:10 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-12-04 16:33:08 -0500
commit2f9d4084cac96a0281522b548ca0526c1e241b75 (patch)
tree3abcb0009595224c1be2da0382fff50ffe812cc0 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
parentd1f6dc1a9a106a73510181cfad9b4a7a0b140990 (diff)
drm/amdgpu:cleanup force_completion
cleanups, now only operate on the given ring Signed-off-by: Monk Liu <Monk.Liu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_device.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 3573ecdb06ee..620e3002001d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2872,7 +2872,7 @@ int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, struct amdgpu_job *job)
2872 amd_sched_hw_job_reset(&ring->sched); 2872 amd_sched_hw_job_reset(&ring->sched);
2873 2873
2874 /* after all hw jobs are reset, hw fence is meaningless, so force_completion */ 2874 /* after all hw jobs are reset, hw fence is meaningless, so force_completion */
2875 amdgpu_fence_driver_force_completion_ring(ring); 2875 amdgpu_fence_driver_force_completion(ring);
2876 } 2876 }
2877 2877
2878 /* request to take full control of GPU before re-initialization */ 2878 /* request to take full control of GPU before re-initialization */
@@ -2991,9 +2991,9 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev)
2991 continue; 2991 continue;
2992 kthread_park(ring->sched.thread); 2992 kthread_park(ring->sched.thread);
2993 amd_sched_hw_job_reset(&ring->sched); 2993 amd_sched_hw_job_reset(&ring->sched);
2994 /* after all hw jobs are reset, hw fence is meaningless, so force_completion */
2995 amdgpu_fence_driver_force_completion(ring);
2994 } 2996 }
2995 /* after all hw jobs are reset, hw fence is meaningless, so force_completion */
2996 amdgpu_fence_driver_force_completion(adev);
2997 2997
2998 need_full_reset = amdgpu_need_full_reset(adev); 2998 need_full_reset = amdgpu_need_full_reset(adev);
2999 2999