From 6750c5f70bee2e13249fe04fbc1d32def40d4e74 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Wed, 20 Aug 2025 15:56:41 +0200 Subject: [PATCH] radv/video: Disable H264 encode 8x8 transform when CABAC is disabled VCN5 only supports it with CABAC enabled. Fixes: 960f63596fe ("radv/video: Add VCN5 encode support") Reviewed-by: Ruijing Dong Part-of: (cherry picked from commit 8ac9a9afee8ef687df3d7033dbda91465412be3d) --- .pick_status.json | 2 +- src/amd/vulkan/radv_video_enc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 2b2c0d1ecd5..aebda264977 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6214,7 +6214,7 @@ "description": "radv/video: Disable H264 encode 8x8 transform when CABAC is disabled", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "960f63596fee40fdf395925534a7a918c08b1475", "notes": null diff --git a/src/amd/vulkan/radv_video_enc.c b/src/amd/vulkan/radv_video_enc.c index 1c6c04a8933..356ee98ee31 100644 --- a/src/amd/vulkan/radv_video_enc.c +++ b/src/amd/vulkan/radv_video_enc.c @@ -3047,7 +3047,8 @@ radv_video_patch_encode_session_parameters(struct radv_device *device, struct vk for (unsigned i = 0; i < params->h264_enc.h264_pps_count; i++) { params->h264_enc.h264_pps[i].base.pic_init_qp_minus26 = 0; params->h264_enc.h264_pps[i].base.pic_init_qs_minus26 = 0; - if (pdev->enc_hw_ver < RADV_VIDEO_ENC_HW_5) + if (pdev->enc_hw_ver < RADV_VIDEO_ENC_HW_5 || + !params->h264_enc.h264_pps[i].base.flags.entropy_coding_mode_flag) params->h264_enc.h264_pps[i].base.flags.transform_8x8_mode_flag = 0; } break;