Commit 3ebfa943 authored by Saleemkhan Jamadar's avatar Saleemkhan Jamadar Committed by Alex Deucher
Browse files

drm/amdgpu: update kernel vcn ring test 



add session context buffer to decoder ring test for vcn v1 to v3.

v3 - correct the cmd for sesssion ctx buf
v2 - add the buffer into IB (Leo liu)

Signed-off-by: default avatarSaleemkhan Jamadar <saleemkhan.jamadar@amd.com>
Reviewed-by: default avatarLeo Liu <leo.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f3fa86f5

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

+18 −7
Original line number Diff line number Diff line
@@ -521,6 +521,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring, 
				   struct dma_fence **fence)

{

	u64 addr = AMDGPU_GPU_PAGE_ALIGN(ib_msg->gpu_addr);

	uint64_t session_ctx_buf_gaddr = AMDGPU_GPU_PAGE_ALIGN(ib_msg->gpu_addr + 8192);

	struct amdgpu_device *adev = ring->adev;

	struct dma_fence *f = NULL;

	struct amdgpu_job *job;
@@ -534,13 +535,23 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring, 
		goto err;



	ib = &job->ibs[0];

	ib->ptr[0] = PACKET0(adev->vcn.internal.data0, 0);

	ib->ptr[1] = addr;

	ib->ptr[2] = PACKET0(adev->vcn.internal.data1, 0);

	ib->ptr[3] = addr >> 32;

	ib->ptr[4] = PACKET0(adev->vcn.internal.cmd, 0);

	ib->ptr[5] = 0;

	for (i = 6; i < 16; i += 2) {

	ib->length_dw = 0;

	ib->ptr[ib->length_dw++] = PACKET0(adev->vcn.internal.data0, 0);

	ib->ptr[ib->length_dw++] = lower_32_bits(session_ctx_buf_gaddr);

	ib->ptr[ib->length_dw++] = PACKET0(adev->vcn.internal.data1, 0);

	ib->ptr[ib->length_dw++] = upper_32_bits(session_ctx_buf_gaddr);

	/* session ctx buffer cmd */

	ib->ptr[ib->length_dw++] = PACKET0(adev->vcn.internal.cmd, 0);

	ib->ptr[ib->length_dw++] = 0xa;



	ib->ptr[ib->length_dw++] = PACKET0(adev->vcn.internal.data0, 0);

	ib->ptr[ib->length_dw++] = lower_32_bits(addr);

	ib->ptr[ib->length_dw++] = PACKET0(adev->vcn.internal.data1, 0);

	ib->ptr[ib->length_dw++] = upper_32_bits(addr);

	ib->ptr[ib->length_dw++] = PACKET0(adev->vcn.internal.cmd, 0);

	ib->ptr[ib->length_dw++] = 0;



	for (i = ib->length_dw; i < 16; i += 2) {

		ib->ptr[i] = PACKET0(adev->vcn.internal.nop, 0);

		ib->ptr[i+1] = 0;

	}