openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amd: reset hw count when reset job 

Means the hw ring is empty after gpu reset.

Signed-off-by: Chunming Zhou <David1.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Chunming Zhou 2016-07-22 13:01:02 +08:00 committed by Alex Deucher
parent cd437e37cb
commit bdc2eea472
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
View File

@ -393,6 +393,7 @@ void amd_sched_hw_job_reset(struct amd_gpu_scheduler *sched)
s_job->s_fence->parent = NULL; s_job->s_fence->parent = NULL;
} }
} }
atomic_set(&sched->hw_rq_count, 0);
spin_unlock(&sched->job_list_lock); spin_unlock(&sched->job_list_lock);
} }
@ -410,6 +411,8 @@ void amd_sched_job_recovery(struct amd_gpu_scheduler *sched)
list_for_each_entry(s_job, &sched->ring_mirror_list, node) { list_for_each_entry(s_job, &sched->ring_mirror_list, node) {
struct amd_sched_fence *s_fence = s_job->s_fence; struct amd_sched_fence *s_fence = s_job->s_fence;
struct fence *fence = sched->ops->run_job(s_job); struct fence *fence = sched->ops->run_job(s_job);
atomic_inc(&sched->hw_rq_count);
if (fence) { if (fence) {
s_fence->parent = fence_get(fence); s_fence->parent = fence_get(fence);
r = fence_add_callback(fence, &s_fence->cb, r = fence_add_callback(fence, &s_fence->cb,