Commit 0c6b391d authored by Leo Liu's avatar Leo Liu Committed by Alex Deucher
Browse files

drm/amdgpu: enable Doorbell support for Renoir (v2) 



Add VCN range aperture to NBIO 7.0

v2: rebase (Alex)

Acked-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarLeo Liu <leo.liu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent dc9b6e93

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

+21 −0
Original line number Diff line number Diff line
@@ -91,6 +91,26 @@ static void nbio_v7_0_sdma_doorbell_range(struct amdgpu_device *adev, int instan 
	WREG32(reg, doorbell_range);

}



static void nbio_v7_0_vcn_doorbell_range(struct amdgpu_device *adev, bool use_doorbell,

					 int doorbell_index, int instance)

{

	u32 reg = SOC15_REG_OFFSET(NBIO, 0, mmBIF_MMSCH0_DOORBELL_RANGE);



	u32 doorbell_range = RREG32(reg);



	if (use_doorbell) {

		doorbell_range = REG_SET_FIELD(doorbell_range,

					       BIF_MMSCH0_DOORBELL_RANGE, OFFSET,

					       doorbell_index);

		doorbell_range = REG_SET_FIELD(doorbell_range,

					       BIF_MMSCH0_DOORBELL_RANGE, SIZE, 8);

	} else

		doorbell_range = REG_SET_FIELD(doorbell_range,

					       BIF_MMSCH0_DOORBELL_RANGE, SIZE, 0);



	WREG32(reg, doorbell_range);

}



static void nbio_v7_0_enable_doorbell_aperture(struct amdgpu_device *adev,

					       bool enable)

{
@@ -282,6 +302,7 @@ const struct amdgpu_nbio_funcs nbio_v7_0_funcs = { 
	.hdp_flush = nbio_v7_0_hdp_flush,

	.get_memsize = nbio_v7_0_get_memsize,

	.sdma_doorbell_range = nbio_v7_0_sdma_doorbell_range,

	.vcn_doorbell_range = nbio_v7_0_vcn_doorbell_range,

	.enable_doorbell_aperture = nbio_v7_0_enable_doorbell_aperture,

	.enable_doorbell_selfring_aperture = nbio_v7_0_enable_doorbell_selfring_aperture,

	.ih_doorbell_range = nbio_v7_0_ih_doorbell_range,

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

+4 −0
Original line number Diff line number Diff line
@@ -81,6 +81,10 @@ void vega10_doorbell_index_init(struct amdgpu_device *adev) 
	adev->doorbell_index.uvd_vce.vce_ring2_3 = AMDGPU_DOORBELL64_VCE_RING2_3;

	adev->doorbell_index.uvd_vce.vce_ring4_5 = AMDGPU_DOORBELL64_VCE_RING4_5;

	adev->doorbell_index.uvd_vce.vce_ring6_7 = AMDGPU_DOORBELL64_VCE_RING6_7;

	adev->doorbell_index.vcn.vcn_ring0_1 = AMDGPU_DOORBELL64_VCN0_1;

	adev->doorbell_index.vcn.vcn_ring2_3 = AMDGPU_DOORBELL64_VCN2_3;

	adev->doorbell_index.vcn.vcn_ring4_5 = AMDGPU_DOORBELL64_VCN4_5;

	adev->doorbell_index.vcn.vcn_ring6_7 = AMDGPU_DOORBELL64_VCN6_7;



	adev->doorbell_index.first_non_cp = AMDGPU_DOORBELL64_FIRST_NON_CP;

	adev->doorbell_index.last_non_cp = AMDGPU_DOORBELL64_LAST_NON_CP;

CRA Git | Maintained and supported by SUSTech CRA and CCSE