diff options
| author | Jammy Zhou | 2015-07-31 11:18:15 +0200 |
|---|---|---|
| committer | Alex Deucher | 2015-08-17 22:50:57 +0200 |
| commit | f95b7e3e8664fbea4e60f15e7e8a975e4b2b7c3f (patch) | |
| tree | 8a1fb3c11bbd4443545a593fd0497910a6709ccb /drivers/gpu/drm | |
| parent | drm/amdgpu: return new seq_no for amd_sched_push_job (diff) | |
| download | kernel-qcow2-linux-f95b7e3e8664fbea4e60f15e7e8a975e4b2b7c3f.tar.gz kernel-qcow2-linux-f95b7e3e8664fbea4e60f15e7e8a975e4b2b7c3f.tar.xz kernel-qcow2-linux-f95b7e3e8664fbea4e60f15e7e8a975e4b2b7c3f.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 12 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 2 |
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, if (r) goto err; } - atomic64_set(&c_entity->last_emitted_v_seq, - sched_job->ibs[sched_job->num_ibs - 1].sequence); - wake_up_all(&c_entity->wait_emit); + + amd_sched_emit(c_entity, sched_job->ibs[sched_job->num_ibs - 1].sequence); mutex_unlock(&sched_job->job_lock); 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) return 0; } +/** + * Update emitted sequence and wake up the waiters, called by run_job + * in driver side + * + * @entity The context entity + * @seq The sequence number for the latest emitted job +*/ +void amd_sched_emit(struct amd_context_entity *c_entity, uint64_t seq) +{ + atomic64_set(&c_entity->last_emitted_v_seq, seq); + wake_up_all(&c_entity->wait_emit); +} 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, uint32_t context_id, uint32_t jobs); +void amd_sched_emit(struct amd_context_entity *c_entity, uint64_t seq); + #endif |