aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJammy Zhou <Jammy.Zhou@amd.com>2015-07-31 05:18:15 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-08-17 16:50:57 -0400
commitf95b7e3e8664fbea4e60f15e7e8a975e4b2b7c3f (patch)
tree8a1fb3c11bbd4443545a593fd0497910a6709ccb
parentea199cc9f825f3ef5aab3db5f00dcc639f8a8b02 (diff)
drm/amdgpu: add amd_sched_commit
This function is to update last_emitted_v_seq and wake up the waiters. It should be called by driver in the run_job backend function Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c5
-rw-r--r--drivers/gpu/drm/amd/scheduler/gpu_scheduler.c12
-rw-r--r--drivers/gpu/drm/amd/scheduler/gpu_scheduler.h2
3 files changed, 16 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
index 8c01c51aac41..83138a6c54b5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
@@ -62,9 +62,8 @@ static void amdgpu_sched_run_job(struct amd_gpu_scheduler *sched,
62 if (r) 62 if (r)
63 goto err; 63 goto err;
64 } 64 }
65 atomic64_set(&c_entity->last_emitted_v_seq, 65
66 sched_job->ibs[sched_job->num_ibs - 1].sequence); 66 amd_sched_emit(c_entity, sched_job->ibs[sched_job->num_ibs - 1].sequence);
67 wake_up_all(&c_entity->wait_emit);
68 67
69 mutex_unlock(&sched_job->job_lock); 68 mutex_unlock(&sched_job->job_lock);
70 return; 69 return;
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
index 2c4c261ff928..66938f1597bb 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
@@ -495,3 +495,15 @@ int amd_sched_destroy(struct amd_gpu_scheduler *sched)
495 return 0; 495 return 0;
496} 496}
497 497
498/**
499 * Update emitted sequence and wake up the waiters, called by run_job
500 * in driver side
501 *
502 * @entity The context entity
503 * @seq The sequence number for the latest emitted job
504*/
505void amd_sched_emit(struct amd_context_entity *c_entity, uint64_t seq)
506{
507 atomic64_set(&c_entity->last_emitted_v_seq, seq);
508 wake_up_all(&c_entity->wait_emit);
509}
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
index 37dd6370bd98..af2afdf2309c 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
@@ -151,4 +151,6 @@ int amd_context_entity_init(struct amd_gpu_scheduler *sched,
151 uint32_t context_id, 151 uint32_t context_id,
152 uint32_t jobs); 152 uint32_t jobs);
153 153
154void amd_sched_emit(struct amd_context_entity *c_entity, uint64_t seq);
155
154#endif 156#endif