evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: vidc: do not set video state to DEINIT very early" into kernel.lnx.4.4.r35-rel

Browse source
This commit is contained in:
Linux Build Service Account 2019-05-04 13:41:40 -07:00 • committed by Gerrit - the friendly Code Review server
commit 5e0693b152
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/media/platform/msm/vidc/venus_hfi.c
View file

@ -1682,7 +1682,7 @@ static int __iface_cmdq_write_relaxed(struct venus_hfi_device *device,
__strict_check(device); __strict_check(device);
if (!__core_in_valid_state(device)) { if (!__core_in_valid_state(device)) {
dprintk(VIDC_DBG, "%s - fw not in init state\n", __func__); dprintk(VIDC_ERR, "%s - fw not in init state\n", __func__);
result = -EINVAL; result = -EINVAL;
goto err_q_null; goto err_q_null;
} }
@ -3408,8 +3408,6 @@ static void __process_sys_error(struct venus_hfi_device *device)
{ {
struct hfi_sfr_struct *vsfr = NULL; struct hfi_sfr_struct *vsfr = NULL;
__set_state(device, VENUS_STATE_DEINIT);
/* Once SYS_ERROR received from HW, it is safe to halt the AXI. /* Once SYS_ERROR received from HW, it is safe to halt the AXI.
* With SYS_ERROR, Venus FW may have crashed and HW might be * With SYS_ERROR, Venus FW may have crashed and HW might be
* active and causing unnecessary transactions. Hence it is * active and causing unnecessary transactions. Hence it is
@ -3656,6 +3654,10 @@ static int __response_handler(struct venus_hfi_device *device)
"Too many packets in message queue to handle at once, deferring read\n"); "Too many packets in message queue to handle at once, deferring read\n");
break; break;
} }
/* do not read packets after sys error packet */
if (info->response_type == HAL_SYS_ERROR)
break;
} }
if (requeue_pm_work && device->res->sw_power_collapsible) { if (requeue_pm_work && device->res->sw_power_collapsible) {