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

Commit 97b9ad12 authored by Felix Kuehling's avatar Felix Kuehling Committed by Oded Gabbay
Browse files

drm/amdkfd: Use ASIC-specific SDMA MQD type 



Signed-off-by: default avatarshaoyun liu <shaoyun.liu@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent 9807c366

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

+5 −8
Original line number Diff line number Diff line
@@ -36,6 +36,11 @@ static inline struct cik_mqd *get_mqd(void *mqd) 
	return (struct cik_mqd *)mqd;

}



static inline struct cik_sdma_rlc_registers *get_sdma_mqd(void *mqd)

{

	return (struct cik_sdma_rlc_registers *)mqd;

}



static int init_mqd(struct mqd_manager *mm, void **mqd,

		struct kfd_mem_obj **mqd_mem_obj, uint64_t *gart_addr,

		struct queue_properties *q)
@@ -362,14 +367,6 @@ static int update_mqd_hiq(struct mqd_manager *mm, void *mqd, 
	return 0;

}



struct cik_sdma_rlc_registers *get_sdma_mqd(void *mqd)

{

	struct cik_sdma_rlc_registers *m;



	m = (struct cik_sdma_rlc_registers *)mqd;



	return m;

}



struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type,

		struct kfd_dev *dev)

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

+5 −0
Original line number Diff line number Diff line
@@ -38,6 +38,11 @@ static inline struct vi_mqd *get_mqd(void *mqd) 
	return (struct vi_mqd *)mqd;

}



static inline struct vi_sdma_mqd *get_sdma_mqd(void *mqd)

{

	return (struct vi_sdma_mqd *)mqd;

}



static int init_mqd(struct mqd_manager *mm, void **mqd,

			struct kfd_mem_obj **mqd_mem_obj, uint64_t *gart_addr,

			struct queue_properties *q)

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

+0 −2
Original line number Diff line number Diff line
@@ -643,8 +643,6 @@ int kgd2kfd_resume(struct kfd_dev *kfd); 
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, const struct queue_properties *properties);

void uninit_queue(struct queue *q);

void print_queue_properties(struct queue_properties *q);