Browse Source

video: driver: remove noc error log registers reading

Accessing vcodec subsystem registers without video core clock enabled
will result in register access errors. Core clock might have been
already disabled by video firmware as part of inter frame power collapse.
So do not read vcodec noc error log registers from video driver.

Change-Id: I19a32c377c661aa848fbd463ae59159cca4cfe04
Signed-off-by: Maheshwar Ajja <[email protected]>
Maheshwar Ajja 4 years ago
parent
commit
2fc3c64665
1 changed files with 9 additions and 1 deletions
  1. 9 1
      driver/variant/iris2/src/msm_vidc_iris2.c

+ 9 - 1
driver/variant/iris2/src/msm_vidc_iris2.c

@@ -862,7 +862,6 @@ static int __watchdog_iris2(struct msm_vidc_core *vidc_core, u32 intr_status)
 
 
 static int __noc_error_info_iris2(struct msm_vidc_core *vidc_core)
 static int __noc_error_info_iris2(struct msm_vidc_core *vidc_core)
 {
 {
-	u32 val = 0;
 	struct msm_vidc_core *core = vidc_core;
 	struct msm_vidc_core *core = vidc_core;
 
 
 	if (!core) {
 	if (!core) {
@@ -870,6 +869,14 @@ static int __noc_error_info_iris2(struct msm_vidc_core *vidc_core)
 		return -EINVAL;
 		return -EINVAL;
 	}
 	}
 
 
+	/*
+	 * we are not supposed to access vcodec subsystem registers
+	 * unless vcodec core clock WRAPPER_CORE_CLOCK_CONFIG_IRIS2 is enabled.
+	 * core clock might have been disabled by video firmware as part of
+	 * inter frame power collapse (power plane control feature).
+	 */
+
+	/*
 	val = __read_register(core, VCODEC_NOC_ERL_MAIN_SWID_LOW);
 	val = __read_register(core, VCODEC_NOC_ERL_MAIN_SWID_LOW);
 	d_vpr_e("VCODEC_NOC_ERL_MAIN_SWID_LOW:     %#x\n", val);
 	d_vpr_e("VCODEC_NOC_ERL_MAIN_SWID_LOW:     %#x\n", val);
 	val = __read_register(core, VCODEC_NOC_ERL_MAIN_SWID_HIGH);
 	val = __read_register(core, VCODEC_NOC_ERL_MAIN_SWID_HIGH);
@@ -896,6 +903,7 @@ static int __noc_error_info_iris2(struct msm_vidc_core *vidc_core)
 	d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_LOW:     %#x\n", val);
 	d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_LOW:     %#x\n", val);
 	val = __read_register(core, VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH);
 	val = __read_register(core, VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH);
 	d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH:     %#x\n", val);
 	d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH:     %#x\n", val);
+	*/
 
 
 	return 0;
 	return 0;
 }
 }