From 6d5c90a321c442bcdd809e108b96b7746e372b33 Mon Sep 17 00:00:00 2001 From: Priyanka Gujjula Date: Wed, 15 Apr 2020 20:13:54 +0530 Subject: [PATCH] msm: vidc: Remove support for noc error info registers on IRIS2 1pipe a. NOC error info registers are different for IRIS2_1 pipe HW to IRIS2 HW. FW can retrieve the same info without NOC error info registers. Hence removing the support to print NOC error info registers for lagoon. b. Since IRIS2 has noc error recovery enabled and same FW is used for IRIS2 and IRIS2_1 pipe, only printing NOC error info registers is disabled with out disabling noc error recovery. Change-Id: I936629e4f53faa5e25b2a64fb92378a26499ed57 Signed-off-by: Priyanka Gujjula --- msm/vidc/hfi_iris2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/msm/vidc/hfi_iris2.c b/msm/vidc/hfi_iris2.c index e64d842d8661..22a1e2db3ade 100644 --- a/msm/vidc/hfi_iris2.c +++ b/msm/vidc/hfi_iris2.c @@ -328,6 +328,8 @@ void __noc_error_info_iris2(struct venus_hfi_device *device) u32 val = 0; u32 sid = DEFAULT_SID; + if (device->res->vpu_ver == VPU_VERSION_IRIS2_1) + return; val = __read_register(device, VCODEC_NOC_ERL_MAIN_SWID_LOW, sid); d_vpr_e("VCODEC_NOC_ERL_MAIN_SWID_LOW: %#x\n", val); val = __read_register(device, VCODEC_NOC_ERL_MAIN_SWID_HIGH, sid);