Skip to content

Commit

Permalink
drm/amdkfd: Pass 'struct queue_propertices' by reference
Browse files Browse the repository at this point in the history
Allow init_queue() to take 'struct queue_properties' by reference.

Signed-off-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
  • Loading branch information
Edward O'Callaghan authored and Oded Gabbay committed Sep 19, 2016
1 parent 6f4d92a commit e88a614
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
Original file line number Diff line number Diff line change
@@ -124,7 +124,7 @@ static bool initialize(struct kernel_queue *kq, struct kfd_dev *dev,
prop.eop_ring_buffer_address = kq->eop_gpu_addr;
prop.eop_ring_buffer_size = PAGE_SIZE;

if (init_queue(&kq->queue, prop) != 0)
if (init_queue(&kq->queue, &prop) != 0)
goto err_init_queue;

kq->queue->device = dev;
2 changes: 1 addition & 1 deletion drivers/gpu/drm/amd/amdkfd/kfd_priv.h
Original file line number Diff line number Diff line change
@@ -619,7 +619,7 @@ int kfd_init_apertures(struct kfd_process *process);
/* Queue Context Management */
struct cik_sdma_rlc_registers *get_sdma_mqd(void *mqd);

int init_queue(struct queue **q, struct queue_properties properties);
int init_queue(struct queue **q, const struct queue_properties *properties);
void uninit_queue(struct queue *q);
void print_queue_properties(struct queue_properties *q);
void print_queue(struct queue *q);
2 changes: 1 addition & 1 deletion drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
Original file line number Diff line number Diff line change
@@ -129,7 +129,7 @@ static int create_cp_queue(struct process_queue_manager *pqm,
q_properties->vmid = 0;
q_properties->queue_id = qid;

retval = init_queue(q, *q_properties);
retval = init_queue(q, q_properties);
if (retval != 0)
goto err_init_queue;

4 changes: 2 additions & 2 deletions drivers/gpu/drm/amd/amdkfd/kfd_queue.c
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ void print_queue(struct queue *q)
pr_debug("Queue Device Address: 0x%p\n", q->device);
}

int init_queue(struct queue **q, struct queue_properties properties)
int init_queue(struct queue **q, const struct queue_properties *properties)
{
struct queue *tmp;

@@ -73,7 +73,7 @@ int init_queue(struct queue **q, struct queue_properties properties)
if (!tmp)
return -ENOMEM;

memcpy(&tmp->properties, &properties, sizeof(struct queue_properties));
memcpy(&tmp->properties, properties, sizeof(struct queue_properties));

*q = tmp;
return 0;

0 comments on commit e88a614

Please sign in to comment.