From 23a04fc9b41312d8e7fa7a04dd85c52fbf2cf83b Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 12 Sep 2024 17:06:13 +1000 Subject: [PATCH] radv/video: add encode field for vcn4 Reviewed-by: Lynne Fixes: 967e4e09dee ("radv/video: add h265 encode support") Part-of: (cherry picked from commit db5312f842c37189edd476f662b76e728b23722c) --- .pick_status.json | 2 +- src/amd/vulkan/radv_video_enc.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 38fbff99a53..2204f8cdfde 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1234,7 +1234,7 @@ "description": "radv/video: add encode field for vcn4", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "967e4e09dee81b93cfb30195ab5e1878aca9dbd0", "notes": null diff --git a/src/amd/vulkan/radv_video_enc.c b/src/amd/vulkan/radv_video_enc.c index d75a4f1bef3..be5e29e629c 100644 --- a/src/amd/vulkan/radv_video_enc.c +++ b/src/amd/vulkan/radv_video_enc.c @@ -476,6 +476,9 @@ radv_enc_session_init(struct radv_cmd_buffer *cmd_buffer, const struct VkVideoEn radeon_emit(cs, 0); // slice output enabled. } radeon_emit(cs, vid->enc_session.display_remote); + if (pdev->enc_hw_ver >= RADV_VIDEO_ENC_HW_4) { + radeon_emit(cs, 0); + } ENC_END; }