Commit 6ee21dbf authored by Leo Liu's avatar Leo Liu Committed by Alex Deucher
Browse files

drm/amdgpu: fix insert nop for VCN decode ring 



NO_OP register should be writen to 0

Signed-off-by: default avatarLeo Liu <leo.liu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cd3cb7c0

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

+8 −6
Original line number Diff line number Diff line
@@ -1048,14 +1048,17 @@ static int vcn_v1_0_process_interrupt(struct amdgpu_device *adev, 
	return 0;

}



static void vcn_v1_0_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count)

static void vcn_v1_0_dec_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count)

{

	int i;

	struct amdgpu_device *adev = ring->adev;

	int i;



	for (i = 0; i < count; i++)

		amdgpu_ring_write(ring, PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_NO_OP), 0));

	WARN_ON(ring->wptr % 2 || count % 2);



	for (i = 0; i < count / 2; i++) {

		amdgpu_ring_write(ring, PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_NO_OP), 0));

		amdgpu_ring_write(ring, 0);

	}

}
@@ -1082,7 +1085,6 @@ static const struct amd_ip_funcs vcn_v1_0_ip_funcs = { 
static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = {

	.type = AMDGPU_RING_TYPE_VCN_DEC,

	.align_mask = 0xf,

	.nop = PACKET0(0x81ff, 0),

	.support_64bit_ptrs = false,

	.vmhub = AMDGPU_MMHUB,

	.get_rptr = vcn_v1_0_dec_ring_get_rptr,
@@ -1101,7 +1103,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { 
	.emit_vm_flush = vcn_v1_0_dec_ring_emit_vm_flush,

	.test_ring = amdgpu_vcn_dec_ring_test_ring,

	.test_ib = amdgpu_vcn_dec_ring_test_ib,

	.insert_nop = vcn_v1_0_ring_insert_nop,

	.insert_nop = vcn_v1_0_dec_ring_insert_nop,

	.insert_start = vcn_v1_0_dec_ring_insert_start,

	.insert_end = vcn_v1_0_dec_ring_insert_end,

	.pad_ib = amdgpu_ring_generic_pad_ib,

CRA Git | Maintained and supported by SUSTech CRA and CCSE