fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 07:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv/video: Correctly handle no feedback query for encode

Browse source 
Fixes vk_layer_validation_tests PositiveVideoEncodeAV1.*

Cc: mesa-stable
Reviewed-by: Benjamin Cheng <benjamin.cheng@amd.com>
(cherry picked from commit 23a3587aa6)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38432>
This commit is contained in:
David Rosca 2025-10-30 08:49:06 +01:00 • committed by Dylan Baker
parent e21d417234
commit 11a4adec73
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -954,7 +954,7 @@
"description": "radv/video: Correctly handle no feedback query for encode", "description": "radv/video: Correctly handle no feedback query for encode",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": null, "because_sha": null,
"notes": null "notes": null

4
src/amd/vulkan/radv_video_enc.c
View file

@ -2765,7 +2765,7 @@ radv_vcn_encode_video(struct radv_cmd_buffer *cmd_buffer, const VkVideoEncodeInf
cmd_buffer->video.enc.total_task_size = 0; cmd_buffer->video.enc.total_task_size = 0;
// task info // task info
radv_enc_task_info(cmd_buffer, true); radv_enc_task_info(cmd_buffer, feedback_query_va);
if (vid->enc_need_begin) { if (vid->enc_need_begin) {
begin(cmd_buffer, enc_info); begin(cmd_buffer, enc_info);
@ -2834,7 +2834,7 @@ radv_vcn_encode_video(struct radv_cmd_buffer *cmd_buffer, const VkVideoEncodeInf
if (pdev->enc_hw_ver >= RADV_VIDEO_ENC_HW_2) { if (pdev->enc_hw_ver >= RADV_VIDEO_ENC_HW_2) {
radv_vcn_sq_tail(cs, &cmd_buffer->video.sq); radv_vcn_sq_tail(cs, &cmd_buffer->video.sq);
if (radv_video_write_memory_supported(pdev) == RADV_VIDEO_WRITE_MEMORY_SUPPORT_FULL) if (feedback_query_va && radv_video_write_memory_supported(pdev) == RADV_VIDEO_WRITE_MEMORY_SUPPORT_FULL)
radv_vcn_write_memory(cmd_buffer, feedback_query_va + RADV_ENC_FEEDBACK_STATUS_IDX * sizeof(uint32_t), 1); radv_vcn_write_memory(cmd_buffer, feedback_query_va + RADV_ENC_FEEDBACK_STATUS_IDX * sizeof(uint32_t), 1);
} }
} }