[PATCH v2 2/4] venus: venc: Add support for intra-refresh period

[Stanimir Varbanov]

Add support for intra-refresh period v4l2 control.

Signed-off-by: Stanimir Varbanov <stanimir.varba...@linaro.org>
---
 drivers/media/platform/qcom/venus/core.h      |  1 +
 drivers/media/platform/qcom/venus/venc.c      | 28 +++++++++++++++++++
 .../media/platform/qcom/venus/venc_ctrls.c    |  9 +++++-
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/qcom/venus/core.h 
b/drivers/media/platform/qcom/venus/core.h
index f03ed427accd..097fca39eb79 100644
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -242,6 +242,7 @@ struct venc_controls {
        u32 multi_slice_max_mb;
 
        u32 header_mode;
+       u32 intra_refresh_period;
 
        struct {
                u32 h264;
diff --git a/drivers/media/platform/qcom/venus/venc.c 
b/drivers/media/platform/qcom/venus/venc.c
index 1c61602c5de1..615d90612ebc 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -536,6 +536,7 @@ static int venc_set_properties(struct venus_inst *inst)
        struct hfi_idr_period idrp;
        struct hfi_quantization quant;
        struct hfi_quantization_range quant_range;
+       struct hfi_intra_refresh intra_refresh = {};
        u32 ptype, rate_control, bitrate;
        u32 profile, level;
        int ret;
@@ -717,6 +718,33 @@ static int venc_set_properties(struct venus_inst *inst)
        if (ret)
                return ret;
 
+       if ((inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 ||
+            inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC) &&
+           (rate_control == HFI_RATE_CONTROL_CBR_VFR ||
+            rate_control == HFI_RATE_CONTROL_CBR_CFR)) {
+               intra_refresh.mode = HFI_INTRA_REFRESH_NONE;
+               intra_refresh.cir_mbs = 0;
+
+               if (ctr->intra_refresh_period) {
+                       u32 mbs;
+
+                       mbs = ALIGN(inst->width, 16) * ALIGN(inst->height, 16);
+                       mbs /= 16 * 16;
+                       if (mbs % ctr->intra_refresh_period)
+                               mbs++;
+                       mbs /= ctr->intra_refresh_period;
+
+                       intra_refresh.mode = HFI_INTRA_REFRESH_RANDOM;
+                       intra_refresh.cir_mbs = mbs;
+               }
+
+               ptype = HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH;
+
+               ret = hfi_session_set_property(inst, ptype, &intra_refresh);
+               if (ret)
+                       return ret;
+       }
+
        return 0;
 }
 
diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c 
b/drivers/media/platform/qcom/venus/venc_ctrls.c
index cf860e6446c0..801026fab89d 100644
--- a/drivers/media/platform/qcom/venus/venc_ctrls.c
+++ b/drivers/media/platform/qcom/venus/venc_ctrls.c
@@ -208,6 +208,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
        case V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE:
                ctr->frame_skip_mode = ctrl->val;
                break;
+       case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD:
+               ctr->intra_refresh_period = ctrl->val;
+               break;
        default:
                return -EINVAL;
        }
@@ -223,7 +226,7 @@ int venc_ctrl_init(struct venus_inst *inst)
 {
        int ret;
 
-       ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 33);
+       ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 34);
        if (ret)
                return ret;
 
@@ -374,6 +377,10 @@ int venc_ctrl_init(struct venus_inst *inst)
                               (1 << 
V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT)),
                               V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED);
 
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD, 0,
+                         ((4096 * 2304) >> 8), 1, 0);
+
        ret = inst->ctrl_handler.error;
        if (ret)
                goto err;
-- 
2.17.1