Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 907f95ad authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: fix msm_vidc_err_recovery_disable for non_noc_err"

parents 110459cc f607704b

msm/vidc/msm_vidc_common.c

+6 −6
Original line number Diff line number Diff line
@@ -2168,6 +2168,7 @@ static void handle_sys_error(enum hal_command_response cmd, void *data) 
	struct hfi_device *hdev = NULL;

	struct msm_vidc_inst *inst = NULL;

	int rc = 0;

	bool panic = false;



	subsystem_crashed("venus");

	if (!response) {
@@ -2203,12 +2204,11 @@ static void handle_sys_error(enum hal_command_response cmd, void *data) 
	}



	/* handle the hw error before core released to get full debug info */

	msm_vidc_handle_hw_error(core);

	if ((response->status == VIDC_ERR_NOC_ERROR &&

		(msm_vidc_err_recovery_disable &

			VIDC_DISABLE_NOC_ERR_RECOV)) ||

		(msm_vidc_err_recovery_disable &

			VIDC_DISABLE_NON_NOC_ERR_RECOV)) {

	if (response->status == VIDC_ERR_NOC_ERROR)

		panic = !!(msm_vidc_err_recovery_disable & VIDC_DISABLE_NOC_ERR_RECOV);

	else

		panic = !!(msm_vidc_err_recovery_disable & VIDC_DISABLE_NON_NOC_ERR_RECOV);

	if (panic) {

		d_vpr_e("Got unrecoverable video fw error");

		MSM_VIDC_ERROR(true);

	}