drm/amdgpu: make last_handled_seq atomic

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>
This commit is contained in:
Jammy Zhou 2015-07-31 17:54:29 +08:00 committed by Alex Deucher
parent f95b7e3e86
commit 63ad8d5882
2 changed files with 4 additions and 4 deletions

View File

@ -393,7 +393,7 @@ static int amd_sched_main(void *param)
uint64_t amd_sched_get_handled_seq(struct amd_gpu_scheduler *sched) uint64_t amd_sched_get_handled_seq(struct amd_gpu_scheduler *sched)
{ {
return sched->last_handled_seq; return atomic64_read(&sched->last_handled_seq);
} }
/** /**
@ -414,7 +414,7 @@ void amd_sched_isr(struct amd_gpu_scheduler *sched)
job = NULL; job = NULL;
sched->ops->process_job(sched, job); sched->ops->process_job(sched, job);
sched->last_handled_seq++; atomic64_inc(&sched->last_handled_seq);
wake_up_interruptible(&sched->wait_queue); wake_up_interruptible(&sched->wait_queue);
} }
@ -448,7 +448,7 @@ struct amd_gpu_scheduler *amd_sched_create(void *device,
sched->granularity = granularity; sched->granularity = granularity;
sched->ring_id = ring; sched->ring_id = ring;
sched->preemption = preemption; sched->preemption = preemption;
sched->last_handled_seq = 0; atomic64_set(&sched->last_handled_seq, 0);
snprintf(name, sizeof(name), "gpu_sched[%d]", ring); snprintf(name, sizeof(name), "gpu_sched[%d]", ring);
mutex_init(&sched->sched_lock); mutex_init(&sched->sched_lock);

View File

@ -112,7 +112,7 @@ struct amd_gpu_scheduler {
uint32_t ring_id; uint32_t ring_id;
uint32_t granularity; /* in ms unit */ uint32_t granularity; /* in ms unit */
uint32_t preemption; uint32_t preemption;
uint64_t last_handled_seq; atomic64_t last_handled_seq;
wait_queue_head_t wait_queue; wait_queue_head_t wait_queue;
struct amd_context_entity *current_entity; struct amd_context_entity *current_entity;
struct mutex sched_lock; struct mutex sched_lock;