media: venus: Get codecs and capabilities from hfi platform

[ Upstream commit e29929266be1ac0e40121f56b5c13b52c281db06 ]

Wire up hfi platform codec and capabilities instead of
getting them from firmware.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Stable-dep-of: 9edaaa8e3e15 ("media: venus: hfi_parser: refactor hfi packet parsing logic")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/hfi_parser.c b/drivers/media/platform/qcom/venus/hfi_parser.c
index be9a58ef04d86c1cc99fdc6994fffa3fc22d1854..7a2915befdb83312a255b92e819f579617a5b141 100644 (file)
--- a/drivers/media/platform/qcom/venus/hfi_parser.c
+++ b/drivers/media/platform/qcom/venus/hfi_parser.c
@@ -245,11 +245,49 @@ static void parser_fini(struct venus_inst *inst, u32 codecs, u32 domain)
        }
 }
 
+static int hfi_platform_parser(struct venus_core *core, struct venus_inst *inst)
+{
+       const struct hfi_platform *plat;
+       const struct hfi_plat_caps *caps = NULL;
+       u32 enc_codecs, dec_codecs, count;
+       unsigned int entries;
+
+       if (inst)
+               return 0;
+
+       plat = hfi_platform_get(core->res->hfi_version);
+       if (!plat)
+               return -EINVAL;
+
+       if (plat->codecs)
+               plat->codecs(&enc_codecs, &dec_codecs, &count);
+
+       if (plat->capabilities)
+               caps = plat->capabilities(&entries);
+
+       if (!caps || !entries || !count)
+               return -EINVAL;
+
+       core->enc_codecs = enc_codecs;
+       core->dec_codecs = dec_codecs;
+       core->codecs_count = count;
+       core->max_sessions_supported = MAX_SESSIONS;
+       memset(core->caps, 0, sizeof(*caps) * MAX_CODEC_NUM);
+       memcpy(core->caps, caps, sizeof(*caps) * entries);
+
+       return 0;
+}
+
 u32 hfi_parser(struct venus_core *core, struct venus_inst *inst, void *buf,
               u32 size)
 {
        unsigned int words_count = size >> 2;
        u32 *word = buf, *data, codecs = 0, domain = 0;
+       int ret;
+
+       ret = hfi_platform_parser(core, inst);
+       if (!ret)
+               return HFI_ERR_NONE;
 
        if (size % 4)
                return HFI_ERR_SYS_INSUFFICIENT_RESOURCES;