Commit d1836f38 authored by Thong Thai's avatar Thong Thai Committed by Alex Deucher
Browse files

drm/amd/amdgpu/vcn_v2_0: Move VCN 2.0 specific dec ring test to vcn_v2_0 



VCN 2.0 firmware now requires a packet start command to be sent before
any other decode ring buffer command.

Signed-off-by: default avatarThong Thai <thong.thai@amd.com>
Reviewed-by: default avatarLeo Liu <leo.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent af655cc5

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

+31 −1
Original line number Diff line number Diff line
@@ -2079,6 +2079,36 @@ static int vcn_v2_0_process_interrupt(struct amdgpu_device *adev, 
	return 0;

}



static int vcn_v2_0_dec_ring_test_ring(struct amdgpu_ring *ring)

{

	struct amdgpu_device *adev = ring->adev;

	uint32_t tmp = 0;

	unsigned i;

	int r;



	WREG32(adev->vcn.external.scratch9, 0xCAFEDEAD);

	r = amdgpu_ring_alloc(ring, 4);

	if (r)

		return r;

	amdgpu_ring_write(ring, PACKET0(mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET, 0));

	amdgpu_ring_write(ring, VCN_DEC_KMD_CMD | (VCN_DEC_CMD_PACKET_START << 1));

	amdgpu_ring_write(ring, PACKET0(adev->vcn.internal.scratch9, 0));

	amdgpu_ring_write(ring, 0xDEADBEEF);

	amdgpu_ring_commit(ring);

	for (i = 0; i < adev->usec_timeout; i++) {

		tmp = RREG32(adev->vcn.external.scratch9);

		if (tmp == 0xDEADBEEF)

			break;

		DRM_UDELAY(1);

	}



	if (i >= adev->usec_timeout)

		r = -ETIMEDOUT;



	return r;

}





static int vcn_v2_0_set_powergating_state(void *handle,

					  enum amd_powergating_state state)

{
@@ -2142,7 +2172,7 @@ static const struct amdgpu_ring_funcs vcn_v2_0_dec_ring_vm_funcs = { 
	.emit_ib = vcn_v2_0_dec_ring_emit_ib,

	.emit_fence = vcn_v2_0_dec_ring_emit_fence,

	.emit_vm_flush = vcn_v2_0_dec_ring_emit_vm_flush,

	.test_ring = amdgpu_vcn_dec_ring_test_ring,

	.test_ring = vcn_v2_0_dec_ring_test_ring,

	.test_ib = amdgpu_vcn_dec_ring_test_ib,

	.insert_nop = vcn_v2_0_dec_ring_insert_nop,

	.insert_start = vcn_v2_0_dec_ring_insert_start,

CRA Git | Maintained and supported by SUSTech CRA and CCSE