media: venus: vdec: Add support for display delay and delay enable controls

Add support for display delay and display delay enable std controls.
With this we implement decoder decode output order (decode vs display).
Once firmware implement few new features the controls will be used
for other use-cases.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index a252ed32cc148b87d0743edad69dd6ebd4366062..091dcf767a8723ad1bcefe949aab9cf7b0734557 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -172,6 +172,8 @@ struct vdec_controls {
        u32 post_loop_deb_mode;
        u32 profile;
        u32 level;
+       u32 display_delay;
+       u32 display_delay_enable;
 };
 
 struct venc_controls {

diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
index e4dc97f00fc3c05549525dad4ef4fbf03e6da55a..c20496a14a5534cebf2cb5a6646676ac5009ea85 100644 (file)
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -620,7 +620,7 @@ static int vdec_set_properties(struct venus_inst *inst)
 {
        struct vdec_controls *ctr = &inst->controls.dec;
        struct hfi_enable en = { .enable = 1 };
-       u32 ptype;
+       u32 ptype, decode_order;
        int ret;
 
        if (ctr->post_loop_deb_mode) {
@@ -630,6 +630,14 @@ static int vdec_set_properties(struct venus_inst *inst)
                        return ret;
        }
 
+       if (ctr->display_delay_enable && ctr->display_delay == 0) {
+               ptype = HFI_PROPERTY_PARAM_VDEC_OUTPUT_ORDER;
+               decode_order = HFI_OUTPUT_ORDER_DECODE;
+               ret = hfi_session_set_property(inst, ptype, &decode_order);
+               if (ret)
+                       return ret;
+       }
+
        return 0;
 }
 

diff --git a/drivers/media/platform/qcom/venus/vdec_ctrls.c b/drivers/media/platform/qcom/venus/vdec_ctrls.c
index 974110b75b9362a3afe51d977af1b68ba0304003..07680aae0a3638879ee2ab14c9381c78f2d4096f 100644 (file)
--- a/drivers/media/platform/qcom/venus/vdec_ctrls.c
+++ b/drivers/media/platform/qcom/venus/vdec_ctrls.c
@@ -30,6 +30,12 @@ static int vdec_op_s_ctrl(struct v4l2_ctrl *ctrl)
        case V4L2_CID_MPEG_VIDEO_VP9_LEVEL:
                ctr->level = ctrl->val;
                break;
+       case V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY:
+               ctr->display_delay = ctrl->val;
+               break;
+       case V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY_ENABLE:
+               ctr->display_delay_enable = ctrl->val;
+               break;
        default:
                return -EINVAL;
        }
@@ -89,7 +95,7 @@ int vdec_ctrl_init(struct venus_inst *inst)
        struct v4l2_ctrl *ctrl;
        int ret;
 
-       ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 9);
+       ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 11);
        if (ret)
                return ret;
 
@@ -158,6 +164,14 @@ int vdec_ctrl_init(struct venus_inst *inst)
        if (ctrl)
                ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;
 
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &vdec_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY,
+                         0, 16383, 1, 0);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &vdec_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY_ENABLE,
+                         0, 1, 1, 0);
+
        ret = inst->ctrl_handler.error;
        if (ret) {
                v4l2_ctrl_handler_free(&inst->ctrl_handler);