From: Lang Yu Date: Sat, 7 Oct 2023 02:13:49 +0000 (+0800) Subject: drm/amdgpu/vpe: fix insert_nop ops X-Git-Tag: v6.7-rc1~145^2~10^2~70 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a37f65c4e450c4fed5dd5afd6b9f1c8493a3abc;p=thirdparty%2Fkernel%2Flinux.git drm/amdgpu/vpe: fix insert_nop ops Avoid infinite loop when count is 0. This is missed in rebase. Signed-off-by: Lang Yu Reviewed-by: Yifan Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c index bb74478098bb1..e81579708e966 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c @@ -240,11 +240,12 @@ static void vpe_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count) { int i; - amdgpu_ring_write(ring, ring->funcs->nop | + for (i = 0; i < count; i++) + if (i == 0) + amdgpu_ring_write(ring, ring->funcs->nop | VPE_CMD_NOP_HEADER_COUNT(count - 1)); - - for (i = 0; i < count - 1; i++) - amdgpu_ring_write(ring, 0); + else + amdgpu_ring_write(ring, ring->funcs->nop); } static uint64_t vpe_get_csa_mc_addr(struct amdgpu_ring *ring, uint32_t vmid)