Commit 2b9ced5a authored by Rohit Khaire's avatar Rohit Khaire Committed by Alex Deucher
Browse files

drm/amdgpu: Use PSP to program IH_RB_CNTL_RING1/2 on SRIOV 



This is similar to IH_RB_CNTL programming in
navi10_ih_toggle_ring_interrupts

Signed-off-by: default avatarRohit Khaire <rohit.khaire@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHorace Chen <horace.chen@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ea526799

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

+2 −0
Original line number Diff line number Diff line
@@ -694,6 +694,8 @@ int psp_reg_program(struct psp_context *psp, enum psp_reg_prog_id reg, 


	psp_prep_reg_prog_cmd_buf(cmd, reg, value);

	ret = psp_cmd_submit_buf(psp, NULL, cmd, psp->fence_buf_mc_addr);

	if (ret)

		DRM_ERROR("PSP failed to program reg id %d", reg);



	kfree(cmd);

	return ret;

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

+15 −5
Original line number Diff line number Diff line
@@ -120,11 +120,23 @@ force_update_wptr_for_self_int(struct amdgpu_device *adev, 
	ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL_RING1,

				   RB_USED_INT_THRESHOLD, threshold);



	if (amdgpu_sriov_vf(adev) && amdgpu_sriov_reg_indirect_ih(adev)) {

		if (psp_reg_program(&adev->psp, PSP_REG_IH_RB_CNTL_RING1, ih_rb_cntl))

			return;

	} else {

		WREG32_SOC15(OSSSYS, 0, mmIH_RB_CNTL_RING1, ih_rb_cntl);

	}



	ih_rb_cntl = RREG32_SOC15(OSSSYS, 0, mmIH_RB_CNTL_RING2);

	ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL_RING2,

				   RB_USED_INT_THRESHOLD, threshold);

	if (amdgpu_sriov_vf(adev) && amdgpu_sriov_reg_indirect_ih(adev)) {

		if (psp_reg_program(&adev->psp, PSP_REG_IH_RB_CNTL_RING2, ih_rb_cntl))

			return;

	} else {

		WREG32_SOC15(OSSSYS, 0, mmIH_RB_CNTL_RING2, ih_rb_cntl);

	}



	WREG32_SOC15(OSSSYS, 0, mmIH_CNTL2, ih_cntl);

}
@@ -153,10 +165,8 @@ static int navi10_ih_toggle_ring_interrupts(struct amdgpu_device *adev, 
		tmp = REG_SET_FIELD(tmp, IH_RB_CNTL, ENABLE_INTR, (enable ? 1 : 0));



	if (amdgpu_sriov_vf(adev) && amdgpu_sriov_reg_indirect_ih(adev)) {

		if (psp_reg_program(&adev->psp, ih_regs->psp_reg_id, tmp)) {

			DRM_ERROR("PSP program IH_RB_CNTL failed!\n");

		if (psp_reg_program(&adev->psp, ih_regs->psp_reg_id, tmp))

			return -ETIMEDOUT;

		}

	} else {

		WREG32(ih_regs->ih_rb_cntl, tmp);

	}