Commit faeddb6e authored by Lang Yu's avatar Lang Yu Committed by Alex Deucher
Browse files

drm/amdgpu/umsch: enable doorbell for umsch 



Program vcn_doorbell_range with vcn_ring0_1.

Signed-off-by: default avatarLang Yu <Lang.Yu@amd.com>
Reviewed-by: default avatarVeerabadhran Gopalakrishnan <Veerabadhran.Gopalakrishnan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 10406abe

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

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ int amdgpu_umsch_mm_ring_init(struct amdgpu_umsch_mm *umsch) 
	struct amdgpu_ring *ring = &umsch->ring;



	ring->vm_hub = AMDGPU_MMHUB0(0);

	ring->use_doorbell = 0;

	ring->use_doorbell = true;

	ring->no_scheduler = true;

	ring->doorbell_index = (AMDGPU_NAVI10_DOORBELL64_VCN0_1 << 1) + 6;

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

+2 −1
Original line number Diff line number Diff line
@@ -217,7 +217,8 @@ static int umsch_mm_v4_0_ring_start(struct amdgpu_umsch_mm *umsch) 
	data = REG_SET_FIELD(data, VCN_UMSCH_RB_DB_CTRL, EN, 1);

	WREG32_SOC15(VCN, 0, regVCN_UMSCH_RB_DB_CTRL, data);



	adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell, ring->doorbell_index, 0);

	adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,

		(adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0);



	WREG32_SOC15(VCN, 0, regVCN_UMSCH_RB_BASE_LO, lower_32_bits(ring->gpu_addr));

	WREG32_SOC15(VCN, 0, regVCN_UMSCH_RB_BASE_HI, upper_32_bits(ring->gpu_addr));