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

Commit d1cad9ba authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Don't assume session error as sys error"

parents 4d0d5495 de460676

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

+3 −4
Original line number Diff line number Diff line
@@ -355,11 +355,10 @@ static int hfi_process_session_error(u32 device_id, 
		info->response_type = HAL_RESPONSE_UNUSED;

		break;

	default:

		/* All other errors are not expected and treated as sys error */

		dprintk(VIDC_ERR,

			"%s: data1 %#x, data2 %#x, treat as sys error\n",

			__func__, pkt->event_data1, pkt->event_data2);

		info->response_type = HAL_SYS_ERROR;

			"%s: session %x data1 %#x, data2 %#x\n", __func__,

			pkt->session_id, pkt->event_data1, pkt->event_data2);

		info->response_type = HAL_SESSION_ERROR;

		break;

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -5342,8 +5342,8 @@ int msm_comm_kill_session(struct msm_vidc_inst *inst) 
		return 0;

	}



	dprintk(VIDC_WARN, "%s: inst %pK, session %x state %d\n", __func__,

			inst, inst->state, hash32_ptr(inst->session));

	dprintk(VIDC_ERR, "%s: inst %pK, session %x state %d\n", __func__,

		inst, hash32_ptr(inst->session), inst->state);

	/*

	 * We're internally forcibly killing the session, if fw is aware of

	 * the session send session_abort to firmware to clean up and release