From 762ad3fd5bbd5d73f25720a92fb1d0248653b714 Mon Sep 17 00:00:00 2001 From: George Shen Date: Tue, 31 Mar 2020 11:18:51 -0700 Subject: [PATCH] msm: cvp: Reverse cvp gdsc and cbcr ctrl sequence It fixes a CVP CBCR access timeout induced NOC ERR. Change-Id: I5ec7b016c0db62b84ffc05c58cba5cbc3b29f98d 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 47225d63e80f..13bf85ad703b 100644 --- a/drivers/media/platform/msm/cvp/cvp_hfi.c +++ b/drivers/media/platform/msm/cvp/cvp_hfi.c @@ -4144,10 +4144,6 @@ static void power_off_iris2(struct iris_hfi_device *device) dprintk(CVP_WARN, "DBLP Release: lpi_status %x\n", lpi_status); } - /* HPG 6.1.2 Step 5 */ - if (__disable_regulators(device)) - dprintk(CVP_WARN, "Failed to disable regulators\n"); - /* HPG 6.1.2 Step 6 */ __disable_unprepare_clks(device); @@ -4159,6 +4155,10 @@ static void power_off_iris2(struct iris_hfi_device *device) if (__unvote_buses(device)) dprintk(CVP_WARN, "Failed to unvote for buses\n"); + /* HPG 6.1.2 Step 5 */ + if (__disable_regulators(device)) + dprintk(CVP_WARN, "Failed to disable regulators\n"); + /*Do not access registers after this point!*/ device->power_enabled = false; }