Commit 62a7b7fb authored by Oded Gabbay's avatar Oded Gabbay
Browse files

drm/radeon: reduce number of free VMIDs and pipes in KV 



To support HSA on KV, we need to limit the number of vmids and pipes
that are available for radeon's use with KV.

This patch reserves VMIDs 8-15 for amdkfd (so radeon can only use VMIDs
0-7) and also makes radeon thinks that KV has only a single MEC with a single
pipe in it

v3: Use define for static vmid allocation in radeon

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@amd.com>
parent a015c1e9

drivers/gpu/drm/radeon/cik.c

+24 −24
Original line number Diff line number Diff line
@@ -4684,12 +4684,11 @@ static int cik_mec_init(struct radeon_device *rdev) 
	/*

	 * KV:    2 MEC, 4 Pipes/MEC, 8 Queues/Pipe - 64 Queues total

	 * CI/KB: 1 MEC, 4 Pipes/MEC, 8 Queues/Pipe - 32 Queues total

	 * Nonetheless, we assign only 1 pipe because all other pipes will

	 * be handled by KFD

	 */

	if (rdev->family == CHIP_KAVERI)

		rdev->mec.num_mec = 2;

	else

	rdev->mec.num_mec = 1;

	rdev->mec.num_pipe = 4;

	rdev->mec.num_pipe = 1;

	rdev->mec.num_queue = rdev->mec.num_mec * rdev->mec.num_pipe * 8;



	if (rdev->mec.hpd_eop_obj == NULL) {
@@ -4831,13 +4830,10 @@ static int cik_cp_compute_resume(struct radeon_device *rdev) 


	/* init the pipes */

	mutex_lock(&rdev->srbm_mutex);

	for (i = 0; i < (rdev->mec.num_pipe * rdev->mec.num_mec); i++) {

		int me = (i < 4) ? 1 : 2;

		int pipe = (i < 4) ? i : (i - 4);



		eop_gpu_addr = rdev->mec.hpd_eop_gpu_addr + (i * MEC_HPD_SIZE * 2);

	eop_gpu_addr = rdev->mec.hpd_eop_gpu_addr;



		cik_srbm_select(rdev, me, pipe, 0, 0);

	cik_srbm_select(rdev, 0, 0, 0, 0);



	/* write the EOP addr */

	WREG32(CP_HPD_EOP_BASE_ADDR, eop_gpu_addr >> 8);
@@ -4851,8 +4847,7 @@ static int cik_cp_compute_resume(struct radeon_device *rdev) 
	tmp &= ~EOP_SIZE_MASK;

	tmp |= order_base_2(MEC_HPD_SIZE / 8);

	WREG32(CP_HPD_EOP_CONTROL, tmp);

	}

	cik_srbm_select(rdev, 0, 0, 0, 0);



	mutex_unlock(&rdev->srbm_mutex);



	/* init the queues.  Just two for now. */
@@ -5906,8 +5901,13 @@ int cik_ib_parse(struct radeon_device *rdev, struct radeon_ib *ib) 
 */

int cik_vm_init(struct radeon_device *rdev)

{

	/* number of VMs */

	rdev->vm_manager.nvm = 16;

	/*

	 * number of VMs

	 * VMID 0 is reserved for System

	 * radeon graphics/compute will use VMIDs 1-7

	 * amdkfd will use VMIDs 8-15

	 */

	rdev->vm_manager.nvm = RADEON_NUM_OF_VMIDS;

	/* base offset of vram pages */

	if (rdev->flags & RADEON_IS_IGP) {

		u64 tmp = RREG32(MC_VM_FB_OFFSET);

drivers/gpu/drm/radeon/cikd.h

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#define CIK_RB_BITMAP_WIDTH_PER_SH     2

#define HAWAII_RB_BITMAP_WIDTH_PER_SH  4



#define RADEON_NUM_OF_VMIDS	8



/* DIDT IND registers */

#define DIDT_SQ_CTRL0                                     0x0

#       define DIDT_CTRL_EN                               (1 << 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE