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

Commit 52a5fdce authored by Alexey Skidanov's avatar Alexey Skidanov Committed by Oded Gabbay
Browse files

amdkfd: Instead of using get function, use container_of 



Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlexey Skidanov <Alexey.Skidanov@amd.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@amd.com>
parent 9a5634a7

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

+9 −12
Original line number Diff line number Diff line
@@ -67,26 +67,21 @@ static inline unsigned int get_pipes_num_cpsch(void) 
	return PIPE_PER_ME_CP_SCHEDULING;

}



static unsigned int get_sh_mem_bases_nybble_64(struct kfd_process *process,

						struct kfd_dev *dev)

static inline unsigned int

get_sh_mem_bases_nybble_64(struct kfd_process_device *pdd)

{

	struct kfd_process_device *pdd;

	uint32_t nybble;



	pdd = kfd_get_process_device_data(dev, process, 1);

	nybble = (pdd->lds_base >> 60) & 0x0E;



	return nybble;



}



static unsigned int get_sh_mem_bases_32(struct kfd_process *process,

					struct kfd_dev *dev)

static inline unsigned int get_sh_mem_bases_32(struct kfd_process_device *pdd)

{

	struct kfd_process_device *pdd;

	unsigned int shared_base;



	pdd = kfd_get_process_device_data(dev, process, 1);

	shared_base = (pdd->lds_base >> 16) & 0xFF;



	return shared_base;
@@ -96,10 +91,13 @@ static uint32_t compute_sh_mem_bases_64bit(unsigned int top_address_nybble); 
static void init_process_memory(struct device_queue_manager *dqm,

				struct qcm_process_device *qpd)

{

	struct kfd_process_device *pdd;

	unsigned int temp;



	BUG_ON(!dqm || !qpd);



	pdd = qpd_to_pdd(qpd);



	/* check if sh_mem_config register already configured */

	if (qpd->sh_mem_config == 0) {

		qpd->sh_mem_config =
@@ -111,11 +109,11 @@ static void init_process_memory(struct device_queue_manager *dqm, 
	}



	if (qpd->pqm->process->is_32bit_user_mode) {

		temp = get_sh_mem_bases_32(qpd->pqm->process, dqm->dev);

		temp = get_sh_mem_bases_32(pdd);

		qpd->sh_mem_bases = SHARED_BASE(temp);

		qpd->sh_mem_config |= PTR32;

	} else {

		temp = get_sh_mem_bases_nybble_64(qpd->pqm->process, dqm->dev);

		temp = get_sh_mem_bases_nybble_64(pdd);

		qpd->sh_mem_bases = compute_sh_mem_bases_64bit(temp);

	}
@@ -707,8 +705,7 @@ static int stop_cpsch(struct device_queue_manager *dqm) 
	destroy_queues_cpsch(dqm, true);



	list_for_each_entry(node, &dqm->queues, list) {

		pdd = kfd_get_process_device_data(dqm->dev,

						node->qpd->pqm->process, 1);

		pdd = qpd_to_pdd(node->qpd);

		pdd->bound = false;

	}

	kfd2kgd->free_mem(dqm->dev->kgd,

drivers/gpu/drm/amd/amdkfd/kfd_priv.h

+2 −0
Original line number Diff line number Diff line
@@ -414,6 +414,8 @@ struct kfd_process_device { 
	bool bound;

};



#define qpd_to_pdd(x) container_of(x, struct kfd_process_device, qpd)



/* Process data */

struct kfd_process {

	/*