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

Commit afb1436c authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: update uvd_v6_0_ring_vm_funcs to use new nop packet 



Was missed when updating the uvd 6 module.

Fixes: 1aac3c91 (drm/amdgpu: fix insert nop for UVD6 ring)
Reviewed-by: default avatarLeo Liu <leo.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent f8ddb39a

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

+1 −2
Original line number Diff line number Diff line
@@ -1569,7 +1569,6 @@ static const struct amdgpu_ring_funcs uvd_v6_0_ring_phys_funcs = { 
static const struct amdgpu_ring_funcs uvd_v6_0_ring_vm_funcs = {

	.type = AMDGPU_RING_TYPE_UVD,

	.align_mask = 0xf,

	.nop = PACKET0(mmUVD_NO_OP, 0),

	.support_64bit_ptrs = false,

	.get_rptr = uvd_v6_0_ring_get_rptr,

	.get_wptr = uvd_v6_0_ring_get_wptr,
@@ -1587,7 +1586,7 @@ static const struct amdgpu_ring_funcs uvd_v6_0_ring_vm_funcs = { 
	.emit_hdp_flush = uvd_v6_0_ring_emit_hdp_flush,

	.test_ring = uvd_v6_0_ring_test_ring,

	.test_ib = amdgpu_uvd_ring_test_ib,

	.insert_nop = amdgpu_ring_insert_nop,

	.insert_nop = uvd_v6_0_ring_insert_nop,

	.pad_ib = amdgpu_ring_generic_pad_ib,

	.begin_use = amdgpu_uvd_ring_begin_use,

	.end_use = amdgpu_uvd_ring_end_use,