Commit 60a2309e authored by Leo Liu's avatar Leo Liu Committed by Alex Deucher
Browse files

drm/amdgpu: add VCN2.0 decode ib test 



Add internal register offset for registers involving in ib tests

Signed-off-by: default avatarLeo Liu <leo.liu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 45a1a48b

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

+4 −4
Original line number Diff line number Diff line
@@ -349,14 +349,14 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring, 


	ib = &job->ibs[0];

	addr = amdgpu_bo_gpu_offset(bo);

	ib->ptr[0] = PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_GPCOM_VCPU_DATA0), 0);

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

	ib->ptr[1] = addr;

	ib->ptr[2] = PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_GPCOM_VCPU_DATA1), 0);

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

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

	ib->ptr[4] = PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_GPCOM_VCPU_CMD), 0);

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

	ib->ptr[5] = 0;

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

		ib->ptr[i] = PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_NO_OP), 0);

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

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

	}

	ib->length_dw = 16;

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

+5 −1
Original line number Diff line number Diff line
@@ -88,6 +88,10 @@ struct dpg_pause_state { 
};



struct amdgpu_vcn_reg{

	unsigned	data0;

	unsigned	data1;

	unsigned	cmd;

	unsigned	nop;

	unsigned	scratch9;

};

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

+8 −0
Original line number Diff line number Diff line
@@ -130,6 +130,14 @@ static int vcn_v1_0_sw_init(void *handle) 


	adev->vcn.internal.scratch9 = adev->vcn.external.scratch9 =

		SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9);

	adev->vcn.internal.data0 = adev->vcn.external.data0 =

		SOC15_REG_OFFSET(UVD, 0, mmUVD_GPCOM_VCPU_DATA0);

	adev->vcn.internal.data1 = adev->vcn.external.data1 =

		SOC15_REG_OFFSET(UVD, 0, mmUVD_GPCOM_VCPU_DATA1);

	adev->vcn.internal.cmd = adev->vcn.external.cmd =

		SOC15_REG_OFFSET(UVD, 0, mmUVD_GPCOM_VCPU_CMD);

	adev->vcn.internal.nop = adev->vcn.external.nop =

		SOC15_REG_OFFSET(UVD, 0, mmUVD_NO_OP);



	for (i = 0; i < adev->vcn.num_enc_rings; ++i) {

		ring = &adev->vcn.ring_enc[i];

CRA Git | Maintained and supported by SUSTech CRA and CCSE