media: allegro: fix log2_max_poc in firmware 2019.1

The log2_max_poc field is used to set log2_max_pic_order_cnt_lsb_minus4
for the coded stream. It has an allowed range of 0 to 12.

param contains the value without the minus4, but since firmware
version 2019.1, the value has to be log2_max_pic_order_cnt_lsb - 1,
presumably to fit the maximum value of 16 into a 4 bit field.

The driver does not support firmware version 2019.1. Thus, change the
behaviour starting from firmware version 2019.2.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/allegro-dvt/allegro-mail.c b/drivers/media/platform/allegro-dvt/allegro-mail.c
index 993e16f..5dbc1c0 100644 (file)
--- a/drivers/media/platform/allegro-dvt/allegro-mail.c
+++ b/drivers/media/platform/allegro-dvt/allegro-mail.c
@@ -109,8 +109,11 @@ allegro_encode_config_blob(u32 *dst, struct create_channel_param *param)
 
        val = 0;
        val |= param->temporal_mvp_enable ? BIT(20) : 0;
-       val |= FIELD_PREP(GENMASK(7, 4), param->log2_max_frame_num) |
-              FIELD_PREP(GENMASK(3, 0), param->log2_max_poc);
+       val |= FIELD_PREP(GENMASK(7, 4), param->log2_max_frame_num);
+       if (version >= MCU_MSG_VERSION_2019_2)
+               val |= FIELD_PREP(GENMASK(3, 0), param->log2_max_poc - 1);
+       else
+               val |= FIELD_PREP(GENMASK(3, 0), param->log2_max_poc);
        dst[i++] = val;
 
        val = 0;