From 8ffedebf1ca1f28bbe6853509cda33177f972734 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Wed, 9 Apr 2025 15:35:34 +0200 Subject: [PATCH] radv/video: Fix encode session info for VCN3+ Last dword should be 0. Cc: mesa-stable Reviewed-by: Dave Airlie Part-of: (cherry picked from commit 7249d9548ea71aafb9c98574e616d3aaddb8ae9a) --- .pick_status.json | 2 +- src/amd/vulkan/radv_video_enc.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0912595b73b..f7d459ae1af 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1674,7 +1674,7 @@ "description": "radv/video: Fix encode session info for VCN3+", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/radv_video_enc.c b/src/amd/vulkan/radv_video_enc.c index a124fe3d866..c3db6cad6c6 100644 --- a/src/amd/vulkan/radv_video_enc.c +++ b/src/amd/vulkan/radv_video_enc.c @@ -447,7 +447,10 @@ radv_enc_session_info(struct radv_cmd_buffer *cmd_buffer) va += cmd_buffer->video.vid->sessionctx.offset; radeon_emit(cs, va >> 32); radeon_emit(cs, va & 0xffffffff); - radeon_emit(cs, RENCODE_ENGINE_TYPE_ENCODE); + if (pdev->enc_hw_ver < RADV_VIDEO_ENC_HW_3) + radeon_emit(cs, RENCODE_ENGINE_TYPE_ENCODE); + else + radeon_emit(cs, 0); ENC_END; }