media: venus: venc: Add support for intra-refresh type

Add support for intra-refresh type v4l2 control.

Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index c3023340d95ccc946c24f7cf15565784a85e14cb..d33825553edcd062980cdc34f142c1159d628216 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -261,6 +261,7 @@ struct venc_controls {
 
        u32 header_mode;
        bool aud_enable;
+       u32 intra_refresh_type;
        u32 intra_refresh_period;
 
        struct {

diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index adea4c3b8c204abccff6ceb9c791a20de9f575b9..86918aea1d2419fd90e93b73564d0b89b96b6479 100644 (file)
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -893,8 +893,12 @@ static int venc_set_properties(struct venus_inst *inst)
                                mbs++;
                        mbs /= ctr->intra_refresh_period;
 
-                       intra_refresh.mode = HFI_INTRA_REFRESH_RANDOM;
                        intra_refresh.cir_mbs = mbs;
+                       if (ctr->intra_refresh_type ==
+                           V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC)
+                               intra_refresh.mode = HFI_INTRA_REFRESH_CYCLIC;
+                       else
+                               intra_refresh.mode = HFI_INTRA_REFRESH_RANDOM;
                }
 
                ptype = HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH;

diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c b/drivers/media/platform/qcom/venus/venc_ctrls.c
index ea5805e71c1432621af03d11af28da1a11d135f7..ed44e5800759a8b29bb13b303a1fe1fa92e71e96 100644 (file)
--- a/drivers/media/platform/qcom/venus/venc_ctrls.c
+++ b/drivers/media/platform/qcom/venus/venc_ctrls.c
@@ -316,6 +316,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
        case V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY:
                ctr->mastering = *ctrl->p_new.p_hdr10_mastering;
                break;
+       case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE:
+               ctr->intra_refresh_type = ctrl->val;
+               break;
        case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD:
                ctr->intra_refresh_period = ctrl->val;
                break;
@@ -582,6 +585,11 @@ int venc_ctrl_init(struct venus_inst *inst)
                                   V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY,
                                   v4l2_ctrl_ptr_create(NULL));
 
+       v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops,
+                              V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE,
+                              V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC,
+                              0, V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM);
+
        v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
                          V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD, 0,
                          ((4096 * 2304) >> 8), 1, 0);