From 9a37f65c4e450c4fed5dd5afd6b9f1c8493a3abc Mon Sep 17 00:00:00 2001 From: Lang Yu Date: Sat, 7 Oct 2023 10:13:49 +0800 Subject: [PATCH] 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 --- drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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) -- 2.30.2