Merge "msm: vidc: Handle power collapse cancel properly"

err_power_off:

skip_power_off:

	/* Reset PC_READY bit as power_off is skipped, if set by Venus */

	ctrl_status = venus_hfi_read_register(device, VIDC_CPU_CS_SCIACMDARG0);

	if (ctrl_status & VIDC_CPU_CS_SCIACMDARG0_HFI_CTRL_PC_READY) {

		ctrl_status &= ~(VIDC_CPU_CS_SCIACMDARG0_HFI_CTRL_PC_READY);

		venus_hfi_write_register(device, VIDC_CPU_CS_SCIACMDARG0,

			ctrl_status);

	}

	/*

	* When power collapse is escaped, driver no need to inform Venus.

	* Venus is self-sufficient to come out of the power collapse at

	* any stage. Driver can skip power collapse and continue with

	* normal execution.

	*/

	/* Cancel pending delayed works if any */

	cancel_delayed_work(&venus_hfi_pm_work);