Re: [PATCH 2/5] media: venus: Initialize codec data

[amasule]

Hi Stan,

On 2019-06-17 14:07, Stanimir Varbanov wrote:

Hi Aniket,

On 6/11/19 9:05 AM, Aniket Masule wrote:

Initialize the codec data with core resources.

Please squash this patch in 1/5 patch.

Yes Stan.

Signed-off-by: Aniket Masule <amas...@codeaurora.org>
---

drivers/media/platform/qcom/venus/helpers.c | 30 +++++++++++++++++++++++++++++

 drivers/media/platform/qcom/venus/helpers.h |  1 +
 drivers/media/platform/qcom/venus/vdec.c    |  4 ++++
 drivers/media/platform/qcom/venus/venc.c    |  4 ++++
 4 files changed, 39 insertions(+)

diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c

index 5cad601..f7f724b 100644
--- a/drivers/media/platform/qcom/venus/helpers.c
+++ b/drivers/media/platform/qcom/venus/helpers.c

@@ -715,6 +715,36 @@ int venus_helper_set_core_usage(struct venus_inst *inst, u32 usage)

 }
 EXPORT_SYMBOL_GPL(venus_helper_set_core_usage);

+int venus_helper_init_codec_data(struct venus_inst *inst)
+{
+       const struct codec_data *codec_data;
+       unsigned int i, codec_data_size;
+       u32 pixfmt;
+       int ret = 0;
+
+       if (!IS_V4(inst->core))
+               return 0;
+
+       codec_data = inst->core->res->codec_data;
+       codec_data_size = inst->core->res->codec_data_size;
+       pixfmt = inst->session_type == VIDC_SESSION_TYPE_DEC ?
+                       inst->fmt_out->pixfmt : inst->fmt_cap->pixfmt;
+
+       for (i = 0; i < codec_data_size; i++) {
+               if (codec_data[i].pixfmt == pixfmt &&
+                   codec_data[i].session_type == inst->session_type) {
+                       inst->clk_data.codec_data = &codec_data[i];
+                       break;
+               }
+       }
+
+       if (!inst->clk_data.codec_data)
+               ret = -EINVAL;

just return -EINVAL

+
+       return ret;

return 0 is enough, and that will avoid ret variable.

Sure Stan.

+}
+EXPORT_SYMBOL_GPL(venus_helper_init_codec_data);
+

int venus_helper_set_num_bufs(struct venus_inst *inst, unsigned int input_bufs,

                              unsigned int output_bufs,
                              unsigned int output2_bufs)

diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h

index 2475f284..f9360a8 100644
--- a/drivers/media/platform/qcom/venus/helpers.h
+++ b/drivers/media/platform/qcom/venus/helpers.h

@@ -41,6 +41,7 @@ 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_init_codec_data(struct venus_inst *inst);
 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,

diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c

index 282de21..51795fd 100644
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c

@@ -660,6 +660,10 @@ static int vdec_init_session(struct venus_inst *inst)

        if (ret)
                goto deinit;

+       ret = venus_helper_init_codec_data(inst);
+       if (ret)
+               goto deinit;
+
        return 0;
 deinit:
        hfi_session_deinit(inst);

diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c

index 32cff29..792cdce 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c

@@ -847,6 +847,10 @@ static int venc_init_session(struct venus_inst *inst)

        if (ret)
                goto deinit;

+       ret = venus_helper_init_codec_data(inst);
+       if (ret)
+               goto deinit;
+
        ret = venc_set_properties(inst);
        if (ret)
                goto deinit;