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

Commit a88650c0 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: Supress non fatal Session errors"

parents 4a2bd2ee 123a1148

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

+14 −2
Original line number Diff line number Diff line
@@ -213,7 +213,19 @@ static void hfi_process_session_error( 
	cmd_done.device_id = device_id;

	cmd_done.session_id = ((struct hal_session *) pkt->session_id)->

		session_id;

	dprintk(VIDC_INFO, "Received : SESSION_ERROR with event id : %d\n",

		pkt->event_data1);

	switch (pkt->event_data1) {

	case HFI_ERR_SESSION_INVALID_SCALE_FACTOR:

	case HFI_ERR_SESSION_UNSUPPORT_BUFFERTYPE:

	case HFI_ERR_SESSION_UNSUPPORTED_SETTING:

		dprintk(VIDC_INFO, "Non Fatal : HFI_EVENT_SESSION_ERROR\n");

		break;

	default:

		dprintk(VIDC_ERR, "HFI_EVENT_SESSION_ERROR\n");

		callback(SESSION_ERROR, &cmd_done);

		break;

	}

}

static void hfi_process_event_notify(

		msm_vidc_callback callback, u32 device_id,
@@ -237,7 +249,7 @@ static void hfi_process_event_notify( 
		hfi_process_sys_error(callback, device_id);

		break;

	case HFI_EVENT_SESSION_ERROR:

		dprintk(VIDC_ERR, "HFI_EVENT_SESSION_ERROR");

		dprintk(VIDC_INFO, "HFI_EVENT_SESSION_ERROR");

		if (!validate_session_pkt(sessions, sess, session_lock))

			hfi_process_session_error(callback, device_id, pkt);

		break;

drivers/media/platform/msm/vidc/vidc_hfi_helper.h

+6 −1
Original line number Diff line number Diff line
@@ -65,6 +65,11 @@ 
#define HFI_ERR_SESSION_STREAM_CORRUPT		(HFI_COMMON_BASE + 0x100B)

#define HFI_ERR_SESSION_ENC_OVERFLOW		(HFI_COMMON_BASE + 0x100C)

#define HFI_ERR_SESSION_UNSUPPORTED_STREAM	(HFI_COMMON_BASE + 0x100D)

#define HFI_ERR_SESSION_CMDSIZE			(HFI_COMMON_BASE + 0x100E)

#define HFI_ERR_SESSION_UNSUPPORT_CMD		(HFI_COMMON_BASE + 0x100F)

#define HFI_ERR_SESSION_UNSUPPORT_BUFFERTYPE	(HFI_COMMON_BASE + 0x1010)

#define HFI_ERR_SESSION_BUFFERCOUNT_TOOSMALL	(HFI_COMMON_BASE + 0x1011)

#define HFI_ERR_SESSION_INVALID_SCALE_FACTOR	(HFI_COMMON_BASE + 0x1012)



#define HFI_EVENT_SYS_ERROR				(HFI_COMMON_BASE + 0x1)

#define HFI_EVENT_SESSION_ERROR			(HFI_COMMON_BASE + 0x2)