From 201523fbce41230f220122f2543cadafa7a07e6f Mon Sep 17 00:00:00 2001 From: Priyanka Gujjula Date: Fri, 14 Feb 2020 13:38:31 +0530 Subject: [PATCH] msm: vidc: Skip AON register programming for IRIS2 1pipe AON register programming is used to set NOC to low power mode during IRIS2 power off sequence. However AON register memory map is not applicable and hence skipping AON register programming for lagoon. Change-Id: Ib63248d118ed9fecfa5fa87925e8f69625dc1ba8 Signed-off-by: Priyanka Gujjula --- msm/vidc/hfi_iris2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msm/vidc/hfi_iris2.c b/msm/vidc/hfi_iris2.c index e64d842d8661..e1e613d3e6cc 100644 --- a/msm/vidc/hfi_iris2.c +++ b/msm/vidc/hfi_iris2.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. */ #include "msm_vidc_debug.h" @@ -189,6 +189,8 @@ void __power_off_iris2(struct venus_hfi_device *device) __write_register(device, CPU_CS_X2RPMh_IRIS2, 0x3, sid); /* HPG 6.1.2 Step 2, noc to low power */ + if (device->res->vpu_ver == VPU_VERSION_IRIS2_1) + goto skip_aon_mvp_noc; __write_register(device, AON_WRAPPER_MVP_NOC_LPI_CONTROL, 0x1, sid); while (!reg_status && count < max_count) { lpi_status = @@ -205,6 +207,7 @@ void __power_off_iris2(struct venus_hfi_device *device) } /* HPG 6.1.2 Step 3, debug bridge to low power */ +skip_aon_mvp_noc: __write_register(device, WRAPPER_DEBUG_BRIDGE_LPI_CONTROL_IRIS2, 0x7, sid); reg_status = 0;