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

Commit c35d7fcb authored by Maheshwar Ajja's avatar Maheshwar Ajja
Browse files

msm: vidc: Generate sys error for session init failure 



Treat session init failure as fatal and generate sys error.

CRs-Fixed: 2102756
Change-Id: I0db6fc645824fbe106551817ec38da476f972e48
Signed-off-by: default avatarMaheshwar Ajja <majja@codeaurora.org>
parent f4d2bc58

drivers/media/platform/msm/vidc/msm_vidc_common.c

+19 −3
Original line number Diff line number Diff line
@@ -2161,6 +2161,7 @@ static void handle_sys_error(enum hal_command_response cmd, void *data) 
				"Got SYS_ERR but unable to identify core\n");

		return;

	}

	hdev = core->device;



	mutex_lock(&core->lock);

	if (core->state == VIDC_CORE_UNINIT) {
@@ -2181,7 +2182,6 @@ static void handle_sys_error(enum hal_command_response cmd, void *data) 
		msm_vidc_queue_v4l2_event(inst, V4L2_EVENT_MSM_VIDC_SYS_ERROR);

		msm_comm_print_inst_info(inst);

	}

	hdev = core->device;

	dprintk(VIDC_DBG, "Calling core_release\n");

	rc = call_hfi_op(hdev, core_release, hdev->hfi_device_data);

	if (rc) {
@@ -3011,6 +3011,23 @@ int msm_comm_force_cleanup(struct msm_vidc_inst *inst) 
	return msm_vidc_deinit_core(inst);

}



static int msm_comm_session_init_done(int flipped_state,

	struct msm_vidc_inst *inst)

{

	int rc;



	dprintk(VIDC_DBG, "inst %pK: waiting for session init done\n", inst);

	rc = wait_for_state(inst, flipped_state, MSM_VIDC_OPEN_DONE,

			HAL_SESSION_INIT_DONE);

	if (rc) {

		dprintk(VIDC_ERR, "Session init failed for inst %pK\n", inst);

		msm_comm_generate_sys_error(inst);

		return rc;

	}



	return rc;

}



static int msm_comm_session_init(int flipped_state,

	struct msm_vidc_inst *inst)

{
@@ -3693,8 +3710,7 @@ int msm_comm_try_state(struct msm_vidc_inst *inst, int state) 
		if (rc || state <= get_flipped_state(inst->state, state))

			break;

	case MSM_VIDC_OPEN_DONE:

		rc = wait_for_state(inst, flipped_state, MSM_VIDC_OPEN_DONE,

			HAL_SESSION_INIT_DONE);

		rc = msm_comm_session_init_done(flipped_state, inst);

		if (rc || state <= get_flipped_state(inst->state, state))

			break;

	case MSM_VIDC_LOAD_RESOURCES:

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

+3 −3
Original line number Diff line number Diff line
@@ -1047,9 +1047,9 @@ static int venus_hfi_flush_debug_queue(void *dev) 


	mutex_lock(&device->lock);



	if (device->power_enabled) {

		dprintk(VIDC_DBG, "Venus is busy\n");

		rc = -EBUSY;

	if (!device->power_enabled) {

		dprintk(VIDC_WARN, "%s: venus power off\n", __func__);

		rc = -EINVAL;

		goto exit;

	}

	__flush_debug_queue(device, NULL);