media: venus: helpers: add buffer type argument to a helper

This adds one more function argument to pass buffer type to
set_output_resolution() helper function. That is a preparation
to support secondary decoder output.

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 6fd7458f390ac10e93dc764856dac107a58b5960..7e764eeeb07c3b1628496727633782f17b283184 100644 (file)
--- a/drivers/media/platform/qcom/venus/helpers.c
+++ b/drivers/media/platform/qcom/venus/helpers.c
@@ -458,12 +458,13 @@ int venus_helper_set_input_resolution(struct venus_inst *inst,
 EXPORT_SYMBOL_GPL(venus_helper_set_input_resolution);
 
 int venus_helper_set_output_resolution(struct venus_inst *inst,
-                                      unsigned int width, unsigned int height)
+                                      unsigned int width, unsigned int height,
+                                      u32 buftype)
 {
        u32 ptype = HFI_PROPERTY_PARAM_FRAME_SIZE;
        struct hfi_framesize fs;
 
-       fs.buffer_type = HFI_BUFFER_OUTPUT;
+       fs.buffer_type = buftype;
        fs.width = width;
        fs.height = height;
 

diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h
index cd306bd8978f1bf8877ba5c7d1ab331eae8f53ae..0de9989adcdb61fb5e96dd4e6c79dc6665eb3201 100644 (file)
--- a/drivers/media/platform/qcom/venus/helpers.h
+++ b/drivers/media/platform/qcom/venus/helpers.h
@@ -36,7 +36,8 @@ int venus_helper_get_bufreq(struct venus_inst *inst, u32 type,
 int venus_helper_set_input_resolution(struct venus_inst *inst,
                                      unsigned int width, unsigned int height);
 int venus_helper_set_output_resolution(struct venus_inst *inst,
-                                      unsigned int width, unsigned int height);
+                                      unsigned int width, unsigned int height,
+                                      u32 buftype);
 int venus_helper_set_num_bufs(struct venus_inst *inst, unsigned int input_bufs,
                              unsigned int output_bufs);
 int venus_helper_set_color_format(struct venus_inst *inst, u32 fmt);

diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index 4edca7e2cb14efb7b737ef26a270343e9f4fba4e..75527db76ac160be480d292389f6089912850ae0 100644 (file)
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -793,7 +793,8 @@ static int venc_init_session(struct venus_inst *inst)
                goto deinit;
 
        ret = venus_helper_set_output_resolution(inst, inst->width,
-                                                inst->height);
+                                                inst->height,
+                                                HFI_BUFFER_OUTPUT);
        if (ret)
                goto deinit;