From cd4ffc319f4af28a3488fc1788b107096572534c Mon Sep 17 00:00:00 2001 From: Hyunjun Ko Date: Fri, 31 Jan 2025 16:18:41 +0900 Subject: [PATCH] anv: Fix to set CDEF flter flag correctly for AV1 decoding and relevant tiny clean-up. Fixes: 8432b8b2828b ("anv: add initial support for AV1 decoding") Signed-off-by: Hyunjun Ko Acked-by: Lionel Landwerlin Part-of: (cherry picked from commit 52d9edbf05dde63b0819011dcbc1e8070070e405) --- .pick_status.json | 2 +- src/intel/vulkan/genX_cmd_video.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d5c461d32db..65bf0ecad91 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1224,7 +1224,7 @@ "description": "anv: Fix to set CDEF flter flag correctly for AV1 decoding", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "8432b8b2828bca6fa19793b00b3a6e61a06ff650", "notes": null diff --git a/src/intel/vulkan/genX_cmd_video.c b/src/intel/vulkan/genX_cmd_video.c index 43e20f8d1c9..717f7daf80b 100644 --- a/src/intel/vulkan/genX_cmd_video.c +++ b/src/intel/vulkan/genX_cmd_video.c @@ -2098,7 +2098,7 @@ anv_av1_decode_video_tile(struct anv_cmd_buffer *cmd_buffer, pic.AllowScreenContentToolsFlag = std_pic_info->flags.allow_screen_content_tools; pic.ForceIntegerMVFlag = std_pic_info->flags.force_integer_mv; pic.AllowWarpedMotionFlag = std_pic_info->flags.allow_warped_motion; - pic.UseCDEFFilterFlag = seq_hdr->flags.enable_cdef; + pic.UseCDEFFilterFlag = !frame_lossless && seq_hdr->flags.enable_cdef; pic.UseSuperResFlag = std_pic_info->flags.use_superres; pic.FrameLevelLoopRestorationFilterEnable = frame_restoration_type[0] || frame_restoration_type[1] || frame_restoration_type[2]; pic.FrameType = std_pic_info->frame_type; @@ -2113,7 +2113,7 @@ anv_av1_decode_video_tile(struct anv_cmd_buffer *cmd_buffer, pic.LastActiveSegmentSegmentID = last_active_segid; pic.DeltaQPresentFlag = std_pic_info->flags.delta_q_present; pic.DeltaQRes = std_pic_info->delta_q_res; - pic.FrameCodedLosslessMode = frame_lossless; /* TODO */ + pic.FrameCodedLosslessMode = frame_lossless; pic.SegmentMapisZeroFlag = 0; /* TODO */ pic.SegmentIDBufferStreamInEnableFlag = 0; /* TODO */ pic.SegmentIDBufferStreamOutEnableFlag = 0; /* TODO */