Commit 989b6a05 authored by James Zhu's avatar James Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: add vcn nbio doorbell range setting for 2nd vcn instance 



add vcn nbio doorbell range setting for 2nd vcn instance

Signed-off-by: default avatarJames Zhu <James.Zhu@amd.com>
Reviewed-by: default avatarLeo Liu <leo.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8b75a521

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −1
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ struct amdgpu_nbio_funcs { 
	void (*sdma_doorbell_range)(struct amdgpu_device *adev, int instance,

			bool use_doorbell, int doorbell_index, int doorbell_size);

	void (*vcn_doorbell_range)(struct amdgpu_device *adev, bool use_doorbell,

			int doorbell_index);

				   int doorbell_index, int instance);

	void (*enable_doorbell_aperture)(struct amdgpu_device *adev,

					 bool enable);

	void (*enable_doorbell_selfring_aperture)(struct amdgpu_device *adev,

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

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static void nbio_v2_3_sdma_doorbell_range(struct amdgpu_device *adev, int instan 
}



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

					 int doorbell_index)

					 int doorbell_index, int instance)

{

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

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

+17 −3
Original line number Diff line number Diff line
@@ -42,6 +42,14 @@ 
#define GPU_HDP_FLUSH_DONE__RSVD_ENG4_MASK	0x00010000L

#define GPU_HDP_FLUSH_DONE__RSVD_ENG5_MASK	0x00020000L



#define mmBIF_MMSCH1_DOORBELL_RANGE                     0x01dc

#define mmBIF_MMSCH1_DOORBELL_RANGE_BASE_IDX            2

//BIF_MMSCH1_DOORBELL_RANGE

#define BIF_MMSCH1_DOORBELL_RANGE__OFFSET__SHIFT        0x2

#define BIF_MMSCH1_DOORBELL_RANGE__SIZE__SHIFT          0x10

#define BIF_MMSCH1_DOORBELL_RANGE__OFFSET_MASK          0x00000FFCL

#define BIF_MMSCH1_DOORBELL_RANGE__SIZE_MASK            0x001F0000L



static void nbio_v7_4_remap_hdp_registers(struct amdgpu_device *adev)

{

	WREG32_SOC15(NBIO, 0, mmREMAP_HDP_MEM_FLUSH_CNTL,
@@ -115,11 +123,17 @@ static void nbio_v7_4_sdma_doorbell_range(struct amdgpu_device *adev, int instan 
}



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

					 int doorbell_index)

					 int doorbell_index, int instance)

{

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

	u32 reg;

	u32 doorbell_range;



	if (instance)

		reg = SOC15_REG_OFFSET(NBIO, 0, mmBIF_MMSCH1_DOORBELL_RANGE);

	else

		reg = SOC15_REG_OFFSET(NBIO, 0, mmBIF_MMSCH0_DOORBELL_RANGE);



	u32 doorbell_range = RREG32(reg);

	doorbell_range = RREG32(reg);



	if (use_doorbell) {

		doorbell_range = REG_SET_FIELD(doorbell_range,

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

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int vcn_v2_0_hw_init(void *handle) 
	int i, r;



	adev->nbio_funcs->vcn_doorbell_range(adev, ring->use_doorbell,

		ring->doorbell_index);

					     ring->doorbell_index, 0);



	ring->sched.ready = true;

	r = amdgpu_ring_test_ring(ring);

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

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static int vcn_v2_5_hw_init(void *handle) 
	int i, r;



	adev->nbio_funcs->vcn_doorbell_range(adev, ring->use_doorbell,

		ring->doorbell_index);

					     ring->doorbell_index, 0);



	r = amdgpu_ring_test_ring(ring);

	if (r) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE