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

Commit bb3fad0f authored by Umesh Pandey's avatar Umesh Pandey
Browse files

msm: vidc: Handle sufficient events from h/w as sufficient 



Currently all sufficient events from the hardware is insufficient
in driver resulting in output port reconfiguration. Changing all
sufficient buffer events from the hardware to sufficient in driver
for all cases.This helps in passing the sufficient event to the
userspace and decision to convert a sufficient event to
insufficient is handled from the userspace. The userspace uses
V4L2 command for session continue for decoding to progress in
case the event is sufficient.

CRs-Fixed: 2016190
Change-Id: I8b750b406d2ff99bc23aac61d8588e6d052f8618
Signed-off-by: default avatarUmesh Pandey <umeshp@codeaurora.org>
parent 436b4a5f

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

+3 −12
Original line number Diff line number Diff line
@@ -1393,18 +1393,9 @@ static inline int start_streaming(struct msm_vidc_inst *inst) 
	 * - v4l2 client issues CONTINUE to firmware to resume decoding of

	 *   submitted ETBs.

	 */

	if (inst->in_reconfig) {

		dprintk(VIDC_DBG, "send session_continue after reconfig\n");

		rc = call_hfi_op(hdev, session_continue,

				(void *) inst->session);

		if (rc) {

			dprintk(VIDC_ERR,

				"%s - failed to send session_continue\n",

				__func__);

	rc = msm_comm_session_continue(inst);

	if (rc)

		goto fail_start;

		}

	}

	inst->in_reconfig = false;



	msm_comm_scale_clocks_and_bus(inst);

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

+70 −60
Original line number Diff line number Diff line
@@ -1379,7 +1379,7 @@ static void handle_event_change(enum hal_command_response cmd, void *data) 


	switch (event_notify->hal_event_type) {

	case HAL_EVENT_SEQ_CHANGED_SUFFICIENT_RESOURCES:

		event = V4L2_EVENT_SEQ_CHANGED_INSUFFICIENT;

		event = V4L2_EVENT_SEQ_CHANGED_SUFFICIENT;

		break;

	case HAL_EVENT_SEQ_CHANGED_INSUFFICIENT_RESOURCES:

		event = V4L2_EVENT_SEQ_CHANGED_INSUFFICIENT;
@@ -1459,10 +1459,9 @@ static void handle_event_change(enum hal_command_response cmd, void *data) 
	* u32 *ptr = seq_changed_event.u.data;

	* ptr[0] = height

	* ptr[1] = width

	 * ptr[2] = flag to indicate bit depth or/and pic struct changed

	 * ptr[3] = bit depth

	 * ptr[4] = pic struct (progressive or interlaced)

	 * ptr[5] = colour space

	* ptr[2] = bit depth

	* ptr[3] = pic struct (progressive or interlaced)

	* ptr[4] = colour space

	*/



	inst->entropy_mode = msm_comm_hal_to_v4l2(
@@ -1476,49 +1475,29 @@ static void handle_event_change(enum hal_command_response cmd, void *data) 
			event_notify->level);



	ptr = (u32 *)seq_changed_event.u.data;

	ptr[0] = event_notify->height;

	ptr[1] = event_notify->width;

	ptr[2] = event_notify->bit_depth;

	ptr[3] = event_notify->pic_struct;

	ptr[4] = event_notify->colour_space;



	if (ptr != NULL) {

		ptr[2] = 0x0;

		ptr[3] = inst->bit_depth;

		ptr[4] = inst->pic_struct;

		ptr[5] = inst->colour_space;



		if (inst->bit_depth != event_notify->bit_depth) {

			inst->bit_depth = event_notify->bit_depth;

			ptr[2] |= V4L2_EVENT_BITDEPTH_FLAG;

			ptr[3] = inst->bit_depth;

			event = V4L2_EVENT_SEQ_CHANGED_INSUFFICIENT;

			dprintk(VIDC_DBG,

				"V4L2_EVENT_SEQ_CHANGED_INSUFFICIENT due to bit-depth change\n");

		}



		if (inst->pic_struct != event_notify->pic_struct) {

			inst->pic_struct = event_notify->pic_struct;

			event = V4L2_EVENT_SEQ_CHANGED_INSUFFICIENT;

			ptr[2] |= V4L2_EVENT_PICSTRUCT_FLAG;

			ptr[4] = inst->pic_struct;

	dprintk(VIDC_DBG,

				"V4L2_EVENT_SEQ_CHANGED_INSUFFICIENT due to pic-struct change\n");

		}

		"Event payload: height = %d width = %d\n",

		event_notify->height, event_notify->width);



		if (inst->bit_depth == MSM_VIDC_BIT_DEPTH_10

				&& inst->colour_space !=

					event_notify->colour_space) {

			inst->colour_space = event_notify->colour_space;

			event = V4L2_EVENT_SEQ_CHANGED_INSUFFICIENT;

			ptr[2] |= V4L2_EVENT_COLOUR_SPACE_FLAG;

			ptr[5] = inst->colour_space;

	dprintk(VIDC_DBG,

				"V4L2_EVENT_SEQ_CHANGED_INSUFFICIENT due to colour space change\n");

		}

		"Event payload: bit_depth = %d pic_struct = %d colour_space = %d\n",

		event_notify->bit_depth, event_notify->pic_struct,

			event_notify->colour_space);



	}

	mutex_lock(&inst->lock);

	inst->in_reconfig = true;

	inst->reconfig_height = event_notify->height;

	inst->reconfig_width = event_notify->width;

	mutex_unlock(&inst->lock);



	if (event == V4L2_EVENT_SEQ_CHANGED_INSUFFICIENT) {

		dprintk(VIDC_DBG, "V4L2_EVENT_SEQ_CHANGED_INSUFFICIENT\n");

		inst->reconfig_height = event_notify->height;

		inst->reconfig_width = event_notify->width;

		inst->in_reconfig = true;

	} else {

		dprintk(VIDC_DBG, "V4L2_EVENT_SEQ_CHANGED_SUFFICIENT\n");

		dprintk(VIDC_DBG,
@@ -1532,13 +1511,6 @@ static void handle_event_change(enum hal_command_response cmd, void *data) 
	rc = msm_vidc_check_session_supported(inst);

	if (!rc) {

		seq_changed_event.type = event;

		if (event == V4L2_EVENT_SEQ_CHANGED_INSUFFICIENT) {

			u32 *ptr = NULL;



			ptr = (u32 *)seq_changed_event.u.data;

			ptr[0] = event_notify->height;

			ptr[1] = event_notify->width;

		}

		v4l2_event_queue_fh(&inst->event_handler, &seq_changed_event);

	} else if (rc == -ENOTSUPP) {

		msm_vidc_queue_v4l2_event(inst,
@@ -3721,6 +3693,11 @@ int msm_vidc_comm_cmd(void *instance, union msm_v4l2_cmd *cmd) 
		}

		break;

	}

	case V4L2_QCOM_CMD_SESSION_CONTINUE:

	{

		rc = msm_comm_session_continue(inst);

		break;

	}

	default:

		dprintk(VIDC_ERR, "Unknown Command %d\n", which_cmd);

		rc = -ENOTSUPP;
@@ -5475,3 +5452,36 @@ static void msm_comm_print_debug_info(struct msm_vidc_inst *inst) 
	}

	mutex_unlock(&core->lock);

}



int msm_comm_session_continue(void *instance)

{

	struct msm_vidc_inst *inst = instance;

	int rc = 0;

	struct hfi_device *hdev;



	if (!inst || !inst->core || !inst->core->device)

		return -EINVAL;

	hdev = inst->core->device;

	mutex_lock(&inst->lock);

	if (inst->session_type == MSM_VIDC_DECODER && inst->in_reconfig) {

		dprintk(VIDC_DBG, "send session_continue\n");

		rc = call_hfi_op(hdev, session_continue,

						 (void *)inst->session);

		if (rc) {

			dprintk(VIDC_ERR,

					"failed to send session_continue\n");

			rc = -EINVAL;

			goto sess_continue_fail;

		}

		inst->in_reconfig = false;

	} else if (inst->session_type == MSM_VIDC_ENCODER) {

		dprintk(VIDC_DBG,

				"session_continue not supported for encoder");

	} else {

		dprintk(VIDC_ERR,

				"session_continue called in wrong state for decoder");

	}

sess_continue_fail:

	mutex_unlock(&inst->lock);

	return rc;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -97,4 +97,5 @@ bool msm_comm_turbo_session(struct msm_vidc_inst *inst); 
void msm_comm_print_inst_info(struct msm_vidc_inst *inst);

int msm_comm_v4l2_to_hal(int id, int value);

int msm_comm_hal_to_v4l2(int id, int value);

int msm_comm_session_continue(void *instance);

#endif

include/uapi/linux/videodev2.h

+1 −1
Original line number Diff line number Diff line
@@ -1890,7 +1890,7 @@ struct v4l2_encoder_cmd { 
#define V4L2_DEC_CMD_RESUME      (3)

#define V4L2_QCOM_CMD_FLUSH      (4)

#define V4L2_DEC_QCOM_CMD_RECONFIG_HINT  (5)



#define V4L2_QCOM_CMD_SESSION_CONTINUE (6)

/* Flags for V4L2_DEC_CMD_START */

#define V4L2_DEC_CMD_START_MUTE_AUDIO	(1 << 0)