Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f899790 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-amdkfd-next-fixes-2015-02-03' of... 

Merge tag 'drm-amdkfd-next-fixes-2015-02-03' of git://people.freedesktop.org/~gabbayo/linux into drm-next

- Fixing accounting of active queues
- Preserving a register internal state

* tag 'drm-amdkfd-next-fixes-2015-02-03' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdkfd: Preserve CP_MQD_IQ_RPTR internal state
  drm/amdkfd: Fix dqm->queue_count tracking
parents 225963dd d752f95e

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

+6 −3
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ static int create_queue_nocpsch(struct device_queue_manager *dqm, 
	}



	list_add(&q->list, &qpd->queues_list);

	if (q->properties.is_active)

		dqm->queue_count++;



	if (q->properties.type == KFD_QUEUE_TYPE_SDMA)
@@ -313,6 +314,7 @@ static int destroy_queue_nocpsch(struct device_queue_manager *dqm, 
	list_del(&q->list);

	if (list_empty(&qpd->queues_list))

		deallocate_vmid(dqm, qpd, q);

	if (q->properties.is_active)

		dqm->queue_count--;



	/*
@@ -1018,6 +1020,7 @@ static int destroy_queue_cpsch(struct device_queue_manager *dqm, 
		dqm->sdma_queue_count--;



	list_del(&q->list);

	if (q->properties.is_active)

		dqm->queue_count--;



	execute_queues_cpsch(dqm, false);

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c

+3 −1
Original line number Diff line number Diff line
@@ -94,6 +94,9 @@ static int init_mqd(struct mqd_manager *mm, void **mqd, 
	m->cp_hqd_pipe_priority = 1;

	m->cp_hqd_queue_priority = 15;



	if (q->format == KFD_QUEUE_FORMAT_AQL)

		m->cp_hqd_iq_rptr = AQL_ENABLE;



	*mqd = m;

	if (gart_addr != NULL)

		*gart_addr = addr;
@@ -187,7 +190,6 @@ static int update_mqd(struct mqd_manager *mm, void *mqd, 
	m->cp_hqd_vmid = q->vmid;



	if (q->format == KFD_QUEUE_FORMAT_AQL) {

		m->cp_hqd_iq_rptr = AQL_ENABLE;

		m->cp_hqd_pq_control |= NO_UPDATE_RPTR;

	}