media: venus: Add vpu_version to most SoCs

Add vpu_version where I was able to retrieve the information to
allow for more precise hardware-specific code path matching.

Reviewed-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
Reviewed-by: Vikash Garodia <quic_vgarodia@quicinc.com>
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Stanimir Varbanov <stanimir.k.varbanov@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 3fa17d8cb8909400c0ed1a005e99b6da46ade003..80cfadbf16af30af63e2cab39fc0ee7ba76edb1b 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -685,6 +685,7 @@ static const struct venus_resources sdm845_res = {
        .vcodec_clks_num = 2,
        .max_load = 3110400,    /* 4096x2160@90 */
        .hfi_version = HFI_VERSION_4XX,
+       .vpu_version = VPU_VERSION_AR50,
        .vmem_id = VIDC_RESOURCE_NONE,
        .vmem_size = 0,
        .vmem_addr = 0,
@@ -710,6 +711,7 @@ static const struct venus_resources sdm845_res_v2 = {
        .vcodec_num = 2,
        .max_load = 3110400,    /* 4096x2160@90 */
        .hfi_version = HFI_VERSION_4XX,
+       .vpu_version = VPU_VERSION_AR50,
        .vmem_id = VIDC_RESOURCE_NONE,
        .vmem_size = 0,
        .vmem_addr = 0,
@@ -757,6 +759,7 @@ static const struct venus_resources sc7180_res = {
        .opp_pmdomain = (const char *[]) { "cx", NULL },
        .vcodec_num = 1,
        .hfi_version = HFI_VERSION_4XX,
+       .vpu_version = VPU_VERSION_AR50,
        .vmem_id = VIDC_RESOURCE_NONE,
        .vmem_size = 0,
        .vmem_addr = 0,
@@ -810,6 +813,7 @@ static const struct venus_resources sm8250_res = {
        .vcodec_num = 1,
        .max_load = 7833600,
        .hfi_version = HFI_VERSION_6XX,
+       .vpu_version = VPU_VERSION_IRIS2,
        .num_vpp_pipes = 4,
        .vmem_id = VIDC_RESOURCE_NONE,
        .vmem_size = 0,
@@ -867,6 +871,7 @@ static const struct venus_resources sc7280_res = {
        .opp_pmdomain = (const char *[]) { "cx", NULL },
        .vcodec_num = 1,
        .hfi_version = HFI_VERSION_6XX,
+       .vpu_version = VPU_VERSION_IRIS2_1,
        .num_vpp_pipes = 1,
        .vmem_id = VIDC_RESOURCE_NONE,
        .vmem_size = 0,