media: venus: helpers, vdec, venc: add helpers to set work mode and core usage

These are new properties applicable to Venus version 4xx. Add the
helpers and call them from decoder and encoder drivers.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Tested-by: Alexandre Courbot <acourbot@chromium.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
index 4e4109e80988ac7752893e59be933064a7cd70d5..3cd25e25aa70c0a1d84e805c240777c3db76c870 100644 (file)
--- a/drivers/media/platform/qcom/venus/helpers.c
+++ b/drivers/media/platform/qcom/venus/helpers.c
@@ -486,6 +486,34 @@ int venus_helper_set_output_resolution(struct venus_inst *inst,
 }
 EXPORT_SYMBOL_GPL(venus_helper_set_output_resolution);
 
+int venus_helper_set_work_mode(struct venus_inst *inst, u32 mode)
+{
+       const u32 ptype = HFI_PROPERTY_PARAM_WORK_MODE;
+       struct hfi_video_work_mode wm;
+
+       if (!IS_V4(inst->core))
+               return 0;
+
+       wm.video_work_mode = mode;
+
+       return hfi_session_set_property(inst, ptype, &wm);
+}
+EXPORT_SYMBOL_GPL(venus_helper_set_work_mode);
+
+int venus_helper_set_core_usage(struct venus_inst *inst, u32 usage)
+{
+       const u32 ptype = HFI_PROPERTY_CONFIG_VIDEOCORES_USAGE;
+       struct hfi_videocores_usage_type cu;
+
+       if (!IS_V4(inst->core))
+               return 0;
+
+       cu.video_core_enable_mask = usage;
+
+       return hfi_session_set_property(inst, ptype, &cu);
+}
+EXPORT_SYMBOL_GPL(venus_helper_set_core_usage);
+
 int venus_helper_set_num_bufs(struct venus_inst *inst, unsigned int input_bufs,
                              unsigned int output_bufs)
 {

diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h
index 79af7845efbd59807bc9028153c49463a4923105..d5e727e1ecab99ab15ae71e0d84bc515edac1341 100644 (file)
--- a/drivers/media/platform/qcom/venus/helpers.h
+++ b/drivers/media/platform/qcom/venus/helpers.h
@@ -38,6 +38,8 @@ int venus_helper_set_input_resolution(struct venus_inst *inst,
 int venus_helper_set_output_resolution(struct venus_inst *inst,
                                       unsigned int width, unsigned int height,
                                       u32 buftype);
+int venus_helper_set_work_mode(struct venus_inst *inst, u32 mode);
+int venus_helper_set_core_usage(struct venus_inst *inst, u32 usage);
 int venus_helper_set_num_bufs(struct venus_inst *inst, unsigned int input_bufs,
                              unsigned int output_bufs);
 int venus_helper_set_raw_format(struct venus_inst *inst, u32 hfi_format,

diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
index b30f10b229d8927306ae71e998d6b057b11d41bd..99d9459e06438269c74cbd15871443b422c6f69f 100644 (file)
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -548,6 +548,14 @@ static int vdec_set_properties(struct venus_inst *inst)
        u32 ptype;
        int ret;
 
+       ret = venus_helper_set_work_mode(inst, VIDC_WORK_MODE_2);
+       if (ret)
+               return ret;
+
+       ret = venus_helper_set_core_usage(inst, VIDC_CORE_ID_1);
+       if (ret)
+               return ret;
+
        if (core->res->hfi_version == HFI_VERSION_1XX) {
                ptype = HFI_PROPERTY_PARAM_VDEC_CONTINUE_DATA_TRANSFER;
                ret = hfi_session_set_property(inst, ptype, &en);

diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index 75527db76ac160be480d292389f6089912850ae0..5175786a85470379ac4835629fcc353e796d3a25 100644 (file)
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -641,6 +641,14 @@ static int venc_set_properties(struct venus_inst *inst)
        u32 ptype, rate_control, bitrate, profile = 0, level = 0;
        int ret;
 
+       ret = venus_helper_set_work_mode(inst, VIDC_WORK_MODE_2);
+       if (ret)
+               return ret;
+
+       ret = venus_helper_set_core_usage(inst, VIDC_CORE_ID_2);
+       if (ret)
+               return ret;
+
        ptype = HFI_PROPERTY_CONFIG_FRAME_RATE;
        frate.buffer_type = HFI_BUFFER_OUTPUT;
        frate.framerate = inst->fps * (1 << 16);