Commit 4056b033 authored by Graham Sider's avatar Graham Sider Committed by Alex Deucher
Browse files

drm/amdkfd: replace kgd_dev in static gfx v10 funcs 



Static funcs in amdgpu_amdkfd_gfx_v10.c now using amdgpu_device.

Signed-off-by: default avatarGraham Sider <Graham.Sider@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9a17c9b7

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c

+23 −29
Original line number Diff line number Diff line
@@ -44,32 +44,26 @@ static inline struct amdgpu_device *get_amdgpu_device(struct kgd_dev *kgd) 
	return (struct amdgpu_device *)kgd;

}



static void lock_srbm(struct kgd_dev *kgd, uint32_t mec, uint32_t pipe,

static void lock_srbm(struct amdgpu_device *adev, uint32_t mec, uint32_t pipe,

			uint32_t queue, uint32_t vmid)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);



	mutex_lock(&adev->srbm_mutex);

	nv_grbm_select(adev, mec, pipe, queue, vmid);

}



static void unlock_srbm(struct kgd_dev *kgd)

static void unlock_srbm(struct amdgpu_device *adev)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);



	nv_grbm_select(adev, 0, 0, 0, 0);

	mutex_unlock(&adev->srbm_mutex);

}



static void acquire_queue(struct kgd_dev *kgd, uint32_t pipe_id,

static void acquire_queue(struct amdgpu_device *adev, uint32_t pipe_id,

				uint32_t queue_id)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);



	uint32_t mec = (pipe_id / adev->gfx.mec.num_pipe_per_mec) + 1;

	uint32_t pipe = (pipe_id % adev->gfx.mec.num_pipe_per_mec);



	lock_srbm(kgd, mec, pipe, queue_id, 0);

	lock_srbm(adev, mec, pipe, queue_id, 0);

}



static uint64_t get_queue_mask(struct amdgpu_device *adev,
@@ -81,9 +75,9 @@ static uint64_t get_queue_mask(struct amdgpu_device *adev, 
	return 1ull << bit;

}



static void release_queue(struct kgd_dev *kgd)

static void release_queue(struct amdgpu_device *adev)

{

	unlock_srbm(kgd);

	unlock_srbm(adev);

}



static void kgd_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid,
@@ -94,13 +88,13 @@ static void kgd_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid, 
{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);



	lock_srbm(kgd, 0, 0, 0, vmid);

	lock_srbm(adev, 0, 0, 0, vmid);



	WREG32_SOC15(GC, 0, mmSH_MEM_CONFIG, sh_mem_config);

	WREG32_SOC15(GC, 0, mmSH_MEM_BASES, sh_mem_bases);

	/* APE1 no longer exists on GFX9 */



	unlock_srbm(kgd);

	unlock_srbm(adev);

}



static int kgd_set_pasid_vmid_mapping(struct kgd_dev *kgd, u32 pasid,
@@ -159,13 +153,13 @@ static int kgd_init_interrupts(struct kgd_dev *kgd, uint32_t pipe_id) 
	mec = (pipe_id / adev->gfx.mec.num_pipe_per_mec) + 1;

	pipe = (pipe_id % adev->gfx.mec.num_pipe_per_mec);



	lock_srbm(kgd, mec, pipe, 0, 0);

	lock_srbm(adev, mec, pipe, 0, 0);



	WREG32_SOC15(GC, 0, mmCPC_INT_CNTL,

		CP_INT_CNTL_RING0__TIME_STAMP_INT_ENABLE_MASK |

		CP_INT_CNTL_RING0__OPCODE_ERROR_INT_ENABLE_MASK);



	unlock_srbm(kgd);

	unlock_srbm(adev);



	return 0;

}
@@ -231,7 +225,7 @@ static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id, 
	m = get_mqd(mqd);



	pr_debug("Load hqd of pipe %d queue %d\n", pipe_id, queue_id);

	acquire_queue(kgd, pipe_id, queue_id);

	acquire_queue(adev, pipe_id, queue_id);



	/* HQD registers extend from CP_MQD_BASE_ADDR to CP_HQD_EOP_WPTR_MEM. */

	mqd_hqd = &m->cp_mqd_base_addr_lo;
@@ -296,7 +290,7 @@ static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id, 
	data = REG_SET_FIELD(m->cp_hqd_active, CP_HQD_ACTIVE, ACTIVE, 1);

	WREG32_SOC15(GC, 0, mmCP_HQD_ACTIVE, data);



	release_queue(kgd);

	release_queue(adev);



	return 0;

}
@@ -313,7 +307,7 @@ static int kgd_hiq_mqd_load(struct kgd_dev *kgd, void *mqd, 


	m = get_mqd(mqd);



	acquire_queue(kgd, pipe_id, queue_id);

	acquire_queue(adev, pipe_id, queue_id);



	mec = (pipe_id / adev->gfx.mec.num_pipe_per_mec) + 1;

	pipe = (pipe_id % adev->gfx.mec.num_pipe_per_mec);
@@ -349,7 +343,7 @@ static int kgd_hiq_mqd_load(struct kgd_dev *kgd, void *mqd, 


out_unlock:

	spin_unlock(&adev->gfx.kiq.ring_lock);

	release_queue(kgd);

	release_queue(adev);



	return r;

}
@@ -372,13 +366,13 @@ static int kgd_hqd_dump(struct kgd_dev *kgd, 
	if (*dump == NULL)

		return -ENOMEM;



	acquire_queue(kgd, pipe_id, queue_id);

	acquire_queue(adev, pipe_id, queue_id);



	for (reg = SOC15_REG_OFFSET(GC, 0, mmCP_MQD_BASE_ADDR);

	     reg <= SOC15_REG_OFFSET(GC, 0, mmCP_HQD_PQ_WPTR_HI); reg++)

		DUMP_REG(reg);



	release_queue(kgd);

	release_queue(adev);



	WARN_ON_ONCE(i != HQD_N_REGS);

	*n_regs = i;
@@ -496,7 +490,7 @@ static bool kgd_hqd_is_occupied(struct kgd_dev *kgd, uint64_t queue_address, 
	bool retval = false;

	uint32_t low, high;



	acquire_queue(kgd, pipe_id, queue_id);

	acquire_queue(adev, pipe_id, queue_id);

	act = RREG32_SOC15(GC, 0, mmCP_HQD_ACTIVE);

	if (act) {

		low = lower_32_bits(queue_address >> 8);
@@ -506,7 +500,7 @@ static bool kgd_hqd_is_occupied(struct kgd_dev *kgd, uint64_t queue_address, 
		   high == RREG32_SOC15(GC, 0, mmCP_HQD_PQ_BASE_HI))

			retval = true;

	}

	release_queue(kgd);

	release_queue(adev);

	return retval;

}
@@ -548,7 +542,7 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd, 
	int retry;

#endif



	acquire_queue(kgd, pipe_id, queue_id);

	acquire_queue(adev, pipe_id, queue_id);



	if (m->cp_hqd_vmid == 0)

		WREG32_FIELD15(GC, 0, RLC_CP_SCHEDULERS, scheduler1, 0);
@@ -633,13 +627,13 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd, 
			break;

		if (time_after(jiffies, end_jiffies)) {

			pr_err("cp queue preemption time out.\n");

			release_queue(kgd);

			release_queue(adev);

			return -ETIME;

		}

		usleep_range(500, 1000);

	}



	release_queue(kgd);

	release_queue(adev);

	return 0;

}
@@ -762,7 +756,7 @@ static void program_trap_handler_settings(struct kgd_dev *kgd, 
{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);



	lock_srbm(kgd, 0, 0, 0, vmid);

	lock_srbm(adev, 0, 0, 0, vmid);



	/*

	 * Program TBA registers
@@ -781,7 +775,7 @@ static void program_trap_handler_settings(struct kgd_dev *kgd, 
	WREG32(SOC15_REG_OFFSET(GC, 0, mmSQ_SHADER_TMA_HI),

			upper_32_bits(tma_addr >> 8));



	unlock_srbm(kgd);

	unlock_srbm(adev);

}



const struct kfd2kgd_calls gfx_v10_kfd2kgd = {