media: verisilicon: AV1: Fix enable cdef computation

If all the fields of the CDEF parameters are zero (which is the default),
then av1_enable_cdef register needs to be unset
(despite the V4L2_AV1_SEQUENCE_FLAG_ENABLE_CDEF possibly being set).

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Fixes: 727a400686a2c ("media: verisilicon: Add Rockchip AV1 decoder")
Cc: stable@vger.kernel.org
Reported-by: Jianfeng Liu <liujianfeng1994@gmail.com>
Closes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4786
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
[hverkuil: dropped Link tag since it just duplicated the Closes: URL]

diff --git a/drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c b/drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c
index e4703bb6be7c175a89c0b8868cf2eafb84a872ed..f4f7cb45b1f1bd44828ea2091b34e493d477224c 100644 (file)
--- a/drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c
+++ b/drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c
@@ -1396,8 +1396,16 @@ static void rockchip_vpu981_av1_dec_set_cdef(struct hantro_ctx *ctx)
        u16 luma_sec_strength = 0;
        u32 chroma_pri_strength = 0;
        u16 chroma_sec_strength = 0;
+       bool enable_cdef;
        int i;
 
+       enable_cdef = !(cdef->bits == 0 &&
+                       cdef->damping_minus_3 == 0 &&
+                       cdef->y_pri_strength[0] == 0 &&
+                       cdef->y_sec_strength[0] == 0 &&
+                       cdef->uv_pri_strength[0] == 0 &&
+                       cdef->uv_sec_strength[0] == 0);
+       hantro_reg_write(vpu, &av1_enable_cdef, enable_cdef);
        hantro_reg_write(vpu, &av1_cdef_bits, cdef->bits);
        hantro_reg_write(vpu, &av1_cdef_damping, cdef->damping_minus_3);
 
@@ -1953,8 +1961,6 @@ static void rockchip_vpu981_av1_dec_set_parameters(struct hantro_ctx *ctx)
                         !!(ctrls->frame->flags & V4L2_AV1_FRAME_FLAG_SHOW_FRAME));
        hantro_reg_write(vpu, &av1_switchable_motion_mode,
                         !!(ctrls->frame->flags & V4L2_AV1_FRAME_FLAG_IS_MOTION_MODE_SWITCHABLE));
-       hantro_reg_write(vpu, &av1_enable_cdef,
-                        !!(ctrls->sequence->flags & V4L2_AV1_SEQUENCE_FLAG_ENABLE_CDEF));
        hantro_reg_write(vpu, &av1_allow_masked_compound,
                         !!(ctrls->sequence->flags
                            & V4L2_AV1_SEQUENCE_FLAG_ENABLE_MASKED_COMPOUND));