mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-10 14:19:09 -04:00
Merge "msm: vidc: fix msm_vidc_err_recovery_disable for non_noc_err"
This commit is contained in:
commit
907f95adab
1 changed files with 6 additions and 6 deletions
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue