From 89ed8f1d2c752b889a52170ef4b9fd1d4b3c6014 Mon Sep 17 00:00:00 2001 From: George Shen Date: Sat, 27 Jun 2020 22:24:58 -0700 Subject: [PATCH] msm: cvp: Avoid reset CVP clock during power off The change is to avoid SMMU fault introduced by MMNOC power collapse and PMU enabling. Change-Id: Iaa04af73ce2ffa4a51553f74d0cd956d199766ab Signed-off-by: George Shen --- drivers/media/platform/msm/cvp/cvp_hfi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/msm/cvp/cvp_hfi.c b/drivers/media/platform/msm/cvp/cvp_hfi.c index 10cd7b23c447..b68408036a96 100644 --- a/drivers/media/platform/msm/cvp/cvp_hfi.c +++ b/drivers/media/platform/msm/cvp/cvp_hfi.c @@ -4175,10 +4175,10 @@ static void power_off_iris2(struct iris_hfi_device *device) /* HPG 6.1.2 Step 6 */ __disable_unprepare_clks(device); - /* HPG 6.1.2 Step 7 & 8 */ - if (call_iris_op(device, reset_ahb2axi_bridge, device)) - dprintk(CVP_ERR, "Failed to reset ahb2axi\n"); - + /* + * HPG 6.1.2 Step 7 & 8 + * per new HPG update, core clock reset will be unnecessary + */ if (__unvote_buses(device)) dprintk(CVP_WARN, "Failed to unvote for buses\n");