diff options
| author | Christian König <christian.koenig@amd.com> | 2015-08-19 17:37:52 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-08-25 10:41:52 -0400 |
| commit | f85a6dd9ebd1bcaeb2f31cca71537e62606a23c2 (patch) | |
| tree | fe1fea8f99316d596c2cbf5b3c22b92c51d8ec2d /drivers/gpu/drm/amd/scheduler | |
| parent | 9788ec40322ef40d64f6d4276248f40666dc4505 (diff) | |
drm/amdgpu: cleanup entity picking
Cleanup function name, stop checking scheduler ready twice, but
check if kernel thread should stop instead.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/scheduler')
| -rw-r--r-- | drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c index 599318d3df0d..2dd9c8aceba5 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c @@ -106,7 +106,7 @@ static bool amd_sched_ready(struct amd_gpu_scheduler *sched) * Select next entity containing real IB submissions */ static struct amd_sched_entity * -select_context(struct amd_gpu_scheduler *sched) +amd_sched_select_context(struct amd_gpu_scheduler *sched) { struct amd_sched_entity *wake_entity = NULL; struct amd_sched_entity *tmp; @@ -286,20 +286,24 @@ static void amd_sched_process_job(struct fence *f, struct fence_cb *cb) static int amd_sched_main(void *param) { - int r; - struct amd_sched_job *job; struct sched_param sparam = {.sched_priority = 1}; - struct amd_sched_entity *c_entity = NULL; struct amd_gpu_scheduler *sched = (struct amd_gpu_scheduler *)param; + int r; sched_setscheduler(current, SCHED_FIFO, &sparam); while (!kthread_should_stop()) { + struct amd_sched_entity *c_entity = NULL; + struct amd_sched_job *job; struct fence *fence; wait_event_interruptible(sched->wait_queue, - amd_sched_ready(sched) && - (c_entity = select_context(sched))); + kthread_should_stop() || + (c_entity = amd_sched_select_context(sched))); + + if (!c_entity) + continue; + r = kfifo_out(&c_entity->job_queue, &job, sizeof(void *)); if (r != sizeof(void *)) continue; |