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

Commit 12b68447 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: define new error type for unsupported parameters"

parents 289877fa 0a997735

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

+11 −3
Original line number Diff line number Diff line
@@ -4206,6 +4206,14 @@ int msm_vidc_check_session_supported(struct msm_vidc_inst *inst) 
	capability = &inst->capability;

	hdev = inst->core->device;

	rc = msm_vidc_load_supported(inst);

	if (rc) {

		change_inst_state(inst, MSM_VIDC_CORE_INVALID);

		msm_vidc_queue_v4l2_event(inst,

					V4L2_EVENT_MSM_VIDC_HW_OVERLOAD);

		dprintk(VIDC_WARN,

			"%s: Hardware is overloaded\n", __func__);

		return rc;

	}

	if (!rc && inst->capability.capability_set) {

		if (inst->prop.width[CAPTURE_PORT] < capability->width.min ||

			inst->prop.height[CAPTURE_PORT] <
@@ -4241,9 +4249,9 @@ int msm_vidc_check_session_supported(struct msm_vidc_inst *inst) 
	if (rc) {

		change_inst_state(inst, MSM_VIDC_CORE_INVALID);

		msm_vidc_queue_v4l2_event(inst,

					V4L2_EVENT_MSM_VIDC_HW_OVERLOAD);

		dprintk(VIDC_WARN,

			"%s: Hardware is overloaded\n", __func__);

					V4L2_EVENT_MSM_VIDC_HW_UNSUPPORTED);

		dprintk(VIDC_ERR,

			"%s: Resolution unsupported\n", __func__);

	}

	return rc;

}

include/uapi/linux/msm_vidc_dec.h

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#define VDEC_MSG_EVT_INFO_FIELD_DROPPED	(VDEC_MSG_BASE + 16)

#define VDEC_MSG_EVT_HW_OVERLOAD	(VDEC_MSG_BASE + 17)

#define VDEC_MSG_EVT_MAX_CLIENTS	(VDEC_MSG_BASE + 18)

#define VDEC_MSG_EVT_HW_UNSUPPORTED	(VDEC_MSG_BASE + 19)



/*Buffer flags bits masks.*/

#define VDEC_BUFFERFLAG_EOS	0x00000001

include/uapi/linux/videodev2.h

+1 −0
Original line number Diff line number Diff line
@@ -1786,6 +1786,7 @@ struct v4l2_streamparm { 
		(V4L2_EVENT_MSM_VIDC_START + 7)

#define V4L2_EVENT_MSM_VIDC_HW_OVERLOAD (V4L2_EVENT_MSM_VIDC_START + 8)

#define V4L2_EVENT_MSM_VIDC_MAX_CLIENTS (V4L2_EVENT_MSM_VIDC_START + 9)

#define V4L2_EVENT_MSM_VIDC_HW_UNSUPPORTED (V4L2_EVENT_MSM_VIDC_START + 10)



/* Payload for V4L2_EVENT_VSYNC */

struct v4l2_event_vsync {