Merge "msm: vidc: do not set video state to DEINIT very early" (2a381b66) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/vidc_3x/venus_hfi.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -1587,7 +1587,7 @@ static int __iface_cmdq_write_relaxed(struct venus_hfi_device *device,
		__strict_check(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;
		goto err_q_null;
		}
		@@ -3337,8 +3337,6 @@ static void __process_sys_error(struct venus_hfi_device *device)
		{
		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.
		* With SYS_ERROR, Venus FW may have crashed and HW might be
		* active and causing unnecessary transactions. Hence it is
		@@ -3581,6 +3579,9 @@ static int __response_handler(struct venus_hfi_device *device)
		"Too many packets in message queue to handle at once, deferring read\n");
		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) {