drm/amdgpu: enable the Doorbell support for VCN2.5 (530e30fc) · Commits · 戴 / test

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

+52 −12

Original line number	Diff line number	Diff line
		@@ -128,6 +128,8 @@ static int vcn_v2_5_sw_init(void *handle)
		return r;

		ring = &adev->vcn.ring_dec;
		ring->use_doorbell = true;
		ring->doorbell_index = adev->doorbell_index.vcn.vcn_ring0_1 << 1;
		sprintf(ring->name, "vcn_dec");
		r = amdgpu_ring_init(adev, ring, 512, &adev->vcn.irq, 0);
		if (r)
		@@ -153,6 +155,8 @@ static int vcn_v2_5_sw_init(void *handle)

		for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
		ring = &adev->vcn.ring_enc[i];
		ring->use_doorbell = true;
		ring->doorbell_index = (adev->doorbell_index.vcn.vcn_ring0_1 << 1) + 2 + i;
		sprintf(ring->name, "vcn_enc%d", i);
		r = amdgpu_ring_init(adev, ring, 512, &adev->vcn.irq, 0);
		if (r)
		@@ -160,6 +164,8 @@ static int vcn_v2_5_sw_init(void *handle)
		}

		ring = &adev->vcn.ring_jpeg;
		ring->use_doorbell = true;
		ring->doorbell_index = (adev->doorbell_index.vcn.vcn_ring0_1 << 1) + 1;
		sprintf(ring->name, "vcn_jpeg");
		r = amdgpu_ring_init(adev, ring, 512, &adev->vcn.irq, 0);
		if (r)
		@@ -879,6 +885,9 @@ static uint64_t vcn_v2_5_dec_ring_get_wptr(struct amdgpu_ring *ring)
		{
		struct amdgpu_device *adev = ring->adev;

		if (ring->use_doorbell)
		return adev->wb.wb[ring->wptr_offs];
		else
		return RREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR);
		}

		@@ -893,8 +902,13 @@ static void vcn_v2_5_dec_ring_set_wptr(struct amdgpu_ring *ring)
		{
		struct amdgpu_device *adev = ring->adev;

		if (ring->use_doorbell) {
		adev->wb.wb[ring->wptr_offs] = lower_32_bits(ring->wptr);
		WDOORBELL32(ring->doorbell_index, lower_32_bits(ring->wptr));
		} else {
		WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR, lower_32_bits(ring->wptr));
		}
		}

		static const struct amdgpu_ring_funcs vcn_v2_5_dec_ring_vm_funcs = {
		.type = AMDGPU_RING_TYPE_VCN_DEC,
		@@ -954,11 +968,18 @@ static uint64_t vcn_v2_5_enc_ring_get_wptr(struct amdgpu_ring *ring)
		{
		struct amdgpu_device *adev = ring->adev;

		if (ring == &adev->vcn.ring_enc[0])
		if (ring == &adev->vcn.ring_enc[0]) {
		if (ring->use_doorbell)
		return adev->wb.wb[ring->wptr_offs];
		else
		return RREG32_SOC15(UVD, 0, mmUVD_RB_WPTR);
		} else {
		if (ring->use_doorbell)
		return adev->wb.wb[ring->wptr_offs];
		else
		return RREG32_SOC15(UVD, 0, mmUVD_RB_WPTR2);
		}
		}

		/**
		* vcn_v2_5_enc_ring_set_wptr - set enc write pointer
		@@ -971,11 +992,22 @@ static void vcn_v2_5_enc_ring_set_wptr(struct amdgpu_ring *ring)
		{
		struct amdgpu_device *adev = ring->adev;

		if (ring == &adev->vcn.ring_enc[0])
		if (ring == &adev->vcn.ring_enc[0]) {
		if (ring->use_doorbell) {
		adev->wb.wb[ring->wptr_offs] = lower_32_bits(ring->wptr);
		WDOORBELL32(ring->doorbell_index, lower_32_bits(ring->wptr));
		} else {
		WREG32_SOC15(UVD, 0, mmUVD_RB_WPTR, lower_32_bits(ring->wptr));
		else
		}
		} else {
		if (ring->use_doorbell) {
		adev->wb.wb[ring->wptr_offs] = lower_32_bits(ring->wptr);
		WDOORBELL32(ring->doorbell_index, lower_32_bits(ring->wptr));
		} else {
		WREG32_SOC15(UVD, 0, mmUVD_RB_WPTR2, lower_32_bits(ring->wptr));
		}
		}
		}

		static const struct amdgpu_ring_funcs vcn_v2_5_enc_ring_vm_funcs = {
		.type = AMDGPU_RING_TYPE_VCN_ENC,
		@@ -1032,6 +1064,9 @@ static uint64_t vcn_v2_5_jpeg_ring_get_wptr(struct amdgpu_ring *ring)
		{
		struct amdgpu_device *adev = ring->adev;

		if (ring->use_doorbell)
		return adev->wb.wb[ring->wptr_offs];
		else
		return RREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_WPTR);
		}

		@@ -1046,8 +1081,13 @@ static void vcn_v2_5_jpeg_ring_set_wptr(struct amdgpu_ring *ring)
		{
		struct amdgpu_device *adev = ring->adev;

		if (ring->use_doorbell) {
		adev->wb.wb[ring->wptr_offs] = lower_32_bits(ring->wptr);
		WDOORBELL32(ring->doorbell_index, lower_32_bits(ring->wptr));
		} else {
		WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_WPTR, lower_32_bits(ring->wptr));
		}
		}

		static const struct amdgpu_ring_funcs vcn_v2_5_jpeg_ring_vm_funcs = {
		.type = AMDGPU_RING_TYPE_VCN_JPEG,

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -85,6 +85,10 @@ void vega20_doorbell_index_init(struct amdgpu_device *adev)
		adev->doorbell_index.uvd_vce.vce_ring2_3 = AMDGPU_VEGA20_DOORBELL64_VCE_RING2_3;
		adev->doorbell_index.uvd_vce.vce_ring4_5 = AMDGPU_VEGA20_DOORBELL64_VCE_RING4_5;
		adev->doorbell_index.uvd_vce.vce_ring6_7 = AMDGPU_VEGA20_DOORBELL64_VCE_RING6_7;
		adev->doorbell_index.vcn.vcn_ring0_1 = AMDGPU_VEGA20_DOORBELL64_VCN0_1;
		adev->doorbell_index.vcn.vcn_ring2_3 = AMDGPU_VEGA20_DOORBELL64_VCN2_3;
		adev->doorbell_index.vcn.vcn_ring4_5 = AMDGPU_VEGA20_DOORBELL64_VCN4_5;
		adev->doorbell_index.vcn.vcn_ring6_7 = AMDGPU_VEGA20_DOORBELL64_VCN6_7;

		adev->doorbell_index.first_non_cp = AMDGPU_VEGA20_DOORBELL64_FIRST_NON_CP;
		adev->doorbell_index.last_non_cp = AMDGPU_VEGA20_DOORBELL64_LAST_NON_CP;

Admin message