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

drm/scheduler: bind job earlier to scheduler 

Update job earlier with the scheduler it is supposed to be scheduled on.

Otherwise we could incorrectly optimize dependencies when moving an
entity from one scheduler to another.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Nayan Deshmukh <nayan26deshmukh@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2018-08-06 12:46:41 +02:00 committed by Alex Deucher
parent 7febe4bfd5
commit e854b61acf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/scheduler/gpu_scheduler.c
View File

@ -530,8 +530,6 @@ drm_sched_entity_pop_job(struct drm_sched_entity *entity)
if (!sched_job) if (!sched_job)
return NULL; return NULL;
sched_job->sched = sched;
sched_job->s_fence->sched = sched;
while ((entity->dependency = sched->ops->dependency(sched_job, entity))) { while ((entity->dependency = sched->ops->dependency(sched_job, entity))) {
if (drm_sched_entity_add_dependency_cb(entity)) { if (drm_sched_entity_add_dependency_cb(entity)) {
@ -582,6 +580,8 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job,
spin_unlock(&entity->rq_lock); spin_unlock(&entity->rq_lock);
} }
sched_job->sched = entity->rq->sched;
sched_job->s_fence->sched = entity->rq->sched;
trace_drm_sched_job(sched_job, entity); trace_drm_sched_job(sched_job, entity);
atomic_inc(&entity->rq->sched->num_jobs); atomic_inc(&entity->rq->sched->num_jobs);
WRITE_ONCE(entity->last_user, current->group_leader); WRITE_ONCE(entity->last_user, current->group_leader);

2
drivers/gpu/drm/scheduler/sched_fence.c
View File

@ -161,7 +161,7 @@ struct drm_sched_fence *drm_sched_fence_create(struct drm_sched_entity *entity,
return NULL; return NULL;
fence->owner = owner; fence->owner = owner;
fence->sched = entity->rq->sched; fence->sched = NULL;
spin_lock_init(&fence->lock); spin_lock_init(&fence->lock);
seq = atomic_inc_return(&entity->fence_seq); seq = atomic_inc_return(&entity->fence_seq);