From bf518628e97cd98f61474f5e4bd713b1e059103d Mon Sep 17 00:00:00 2001 From: George Shen Date: Tue, 11 Feb 2020 10:05:49 -0800 Subject: [PATCH] msm: cvp: Enable CVP auto PIL The command in init.qcom.rc to load CVP firmware will take effect with this change. Change-Id: Ib45c77c8f34a12a9c01b462847cf2fc25ae1452d Signed-off-by: George Shen --- drivers/media/platform/msm/cvp/cvp_hfi.c | 2 +- drivers/media/platform/msm/cvp/msm_cvp_platform.c | 2 +- drivers/media/platform/msm/cvp/msm_cvp_res_parse.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/msm/cvp/cvp_hfi.c b/drivers/media/platform/msm/cvp/cvp_hfi.c index 569cae3d7be4..e8e125b33ae2 100644 --- a/drivers/media/platform/msm/cvp/cvp_hfi.c +++ b/drivers/media/platform/msm/cvp/cvp_hfi.c @@ -4051,7 +4051,7 @@ static void power_off_iris2(struct iris_hfi_device *device) u32 pc_ready, wfi_status, sbm_ln0_low; u32 main_sbm_ln0_low, main_sbm_ln1_high; - if (!device->power_enabled) + if (!device->power_enabled || !device->res->sw_power_collapsible) return; if (!(device->intr_status & CVP_WRAPPER_INTR_STATUS_A2HWD_BMSK)) diff --git a/drivers/media/platform/msm/cvp/msm_cvp_platform.c b/drivers/media/platform/msm/cvp/msm_cvp_platform.c index f27cc0c60789..bc9d55fe9346 100644 --- a/drivers/media/platform/msm/cvp/msm_cvp_platform.c +++ b/drivers/media/platform/msm/cvp/msm_cvp_platform.c @@ -100,7 +100,7 @@ static struct msm_cvp_common_data sm8250_common_data[] = { static struct msm_cvp_common_data sm8350_common_data[] = { { .key = "qcom,auto-pil", - .value = 0, + .value = 1, }, { .key = "qcom,never-unload-fw", diff --git a/drivers/media/platform/msm/cvp/msm_cvp_res_parse.c b/drivers/media/platform/msm/cvp/msm_cvp_res_parse.c index 4e86ca5d2d43..713815d2cc95 100644 --- a/drivers/media/platform/msm/cvp/msm_cvp_res_parse.c +++ b/drivers/media/platform/msm/cvp/msm_cvp_res_parse.c @@ -694,7 +694,7 @@ int cvp_read_platform_resources_from_drv_data( dprintk(CVP_DBG, "Firmware filename: %s\n", res->fw_name); res->auto_pil = find_key_value(platform_data, - "qcom,aut-pil"); + "qcom,auto-pil"); res->max_load = find_key_value(platform_data, "qcom,max-hw-load");