Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1d37606 authored by Boyuan Zhang's avatar Boyuan Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: add vcn jpeg ring test 



Add a ring test for vcn jpeg.

Signed-off-by: default avatarBoyuan Zhang <boyuan.zhang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0c5e4b3e

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

+40 −0
Original line number Diff line number Diff line
@@ -578,3 +578,43 @@ int amdgpu_vcn_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout) 
	dma_fence_put(fence);

	return r;

}



int amdgpu_vcn_jpeg_ring_test_ring(struct amdgpu_ring *ring)

{

	struct amdgpu_device *adev = ring->adev;

	uint32_t tmp = 0;

	unsigned i;

	int r;



	WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_CONTEXT_ID), 0xCAFEDEAD);

	r = amdgpu_ring_alloc(ring, 3);



	if (r) {

		DRM_ERROR("amdgpu: cp failed to lock ring %d (%d).\n",

				  ring->idx, r);

		return r;

	}



	amdgpu_ring_write(ring,

		PACKETJ(SOC15_REG_OFFSET(UVD, 0, mmUVD_CONTEXT_ID), 0, 0, 0));

	amdgpu_ring_write(ring, 0xDEADBEEF);

	amdgpu_ring_commit(ring);



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

		tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_CONTEXT_ID));

		if (tmp == 0xDEADBEEF)

			break;

		DRM_UDELAY(1);

	}



	if (i < adev->usec_timeout) {

		DRM_DEBUG("ring test on %d succeeded in %d usecs\n",

				  ring->idx, i);

	} else {

		DRM_ERROR("amdgpu: ring %d test failed (0x%08X)\n",

				  ring->idx, tmp);

		r = -EINVAL;

	}



	return r;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -84,4 +84,6 @@ int amdgpu_vcn_dec_ring_test_ib(struct amdgpu_ring *ring, long timeout); 
int amdgpu_vcn_enc_ring_test_ring(struct amdgpu_ring *ring);

int amdgpu_vcn_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout);



int amdgpu_vcn_jpeg_ring_test_ring(struct amdgpu_ring *ring);



#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -1712,7 +1712,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_jpeg_ring_vm_funcs = { 
	.emit_ib = vcn_v1_0_jpeg_ring_emit_ib,

	.emit_fence = vcn_v1_0_jpeg_ring_emit_fence,

	.emit_vm_flush = vcn_v1_0_jpeg_ring_emit_vm_flush,

	//.test_ring

	.test_ring = amdgpu_vcn_jpeg_ring_test_ring,

	//.test_ib

	.insert_nop = vcn_v1_0_jpeg_ring_nop,

	.insert_start = vcn_v1_0_jpeg_ring_insert_start,