From 588b71a376323f7048dec874930c46d5bdeaea67 Mon Sep 17 00:00:00 2001 From: Govindaraj Rajagopal Date: Thu, 2 Apr 2020 16:39:48 +0530 Subject: [PATCH] msm: vidc: update workroute settings for shima use num_vpp_pipes from platform_data to configure workroute. Change-Id: I5fea0d381402f9877fdb5d0df179bc0857016c56 Signed-off-by: Govindaraj Rajagopal --- msm/vidc/msm_vidc_clocks.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/msm/vidc/msm_vidc_clocks.c b/msm/vidc/msm_vidc_clocks.c index 791fe244b340..82fb3e8e16c8 100644 --- a/msm/vidc/msm_vidc_clocks.c +++ b/msm/vidc/msm_vidc_clocks.c @@ -1118,7 +1118,8 @@ int msm_vidc_decide_work_route_iris2(struct msm_vidc_inst *inst) u32 codec; uint32_t vpu; - if (!inst || !inst->core || !inst->core->device) { + if (!inst || !inst->core || !inst->core->device || + !inst->core->platform_data) { d_vpr_e("%s: Invalid args: Inst = %pK\n", __func__, inst); return -EINVAL; @@ -1127,7 +1128,7 @@ int msm_vidc_decide_work_route_iris2(struct msm_vidc_inst *inst) vpu = inst->core->platform_data->vpu_ver; hdev = inst->core->device; is_legacy_cbr = inst->clk_data.is_legacy_cbr; - pdata.video_work_route = 4; + pdata.video_work_route = inst->core->platform_data->num_vpp_pipes; if (vpu == VPU_VERSION_IRIS2_1) { pdata.video_work_route = 1;