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

Commit 45a1a48b authored by Leo Liu's avatar Leo Liu Committed by Alex Deucher
Browse files

drm/amdgpu: add VCN2.0 decode ring test 



Add internal register offset for registers involving in ring 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 a8790e24

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

+3 −5
Original line number Diff line number Diff line
@@ -312,17 +312,15 @@ int amdgpu_vcn_dec_ring_test_ring(struct amdgpu_ring *ring) 
	unsigned i;

	int r;



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

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

	r = amdgpu_ring_alloc(ring, 3);

	if (r)

		return r;



	amdgpu_ring_write(ring,

		PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9), 0));

	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(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9));

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

		if (tmp == 0xDEADBEEF)

			break;

		DRM_UDELAY(1);

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

+5 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ struct dpg_pause_state { 
	enum internal_dpg_state jpeg;

};



struct amdgpu_vcn_reg{

	unsigned	scratch9;

};



struct amdgpu_vcn {

	struct amdgpu_bo	*vcpu_bo;

	void			*cpu_addr;
@@ -102,6 +106,7 @@ struct amdgpu_vcn { 
	unsigned		num_enc_rings;

	enum amd_powergating_state cur_state;

	struct dpg_pause_state pause_state;

	struct amdgpu_vcn_reg	internal, external;

	int (*pause_dpg_mode)(struct amdgpu_device *adev,

		struct dpg_pause_state *new_state);

};

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

+3 −0
Original line number Diff line number Diff line
@@ -128,6 +128,9 @@ static int vcn_v1_0_sw_init(void *handle) 
	if (r)

		return r;



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

		SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9);



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

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

		sprintf(ring->name, "vcn_enc%d", i);