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

Commit 9fb709ef authored by Ashray Kulkarni's avatar Ashray Kulkarni Committed by Arun Menon
Browse files

msm: vidc: Enable session priority support. 



Add support for setting priority to each video session in driver.

Change-Id: Iec9fa69ee42959a93d18fdb59eff1f12c53de235
Signed-off-by: default avatarAshray Kulkarni <ashrayk@codeaurora.org>
Signed-off-by: default avatarArun Menon <avmenon@codeaurora.org>
parent 0600f6c1

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

+2 −2
Original line number Diff line number Diff line
@@ -1022,7 +1022,7 @@ int create_pkt_cmd_session_set_property( 
	{

		create_pkt_enable(pkt->rg_property_data,

			HFI_PROPERTY_CONFIG_REALTIME,

				((struct hal_enable *)pdata)->enable);

			(((struct hfi_enable *) pdata)->enable));

		pkt->size += sizeof(u32) * 2;

		break;

	}

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

+17 −0
Original line number Diff line number Diff line
@@ -596,6 +596,15 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		.qmenu = mpeg_vidc_video_entropy_mode,

		.flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_PRIORITY,

		.name = "Session Priority",

		.type = V4L2_CTRL_TYPE_BOOLEAN,

		.minimum = V4L2_MPEG_VIDC_VIDEO_PRIORITY_REALTIME_ENABLE,

		.maximum = V4L2_MPEG_VIDC_VIDEO_PRIORITY_REALTIME_DISABLE,

		.default_value = V4L2_MPEG_VIDC_VIDEO_PRIORITY_REALTIME_DISABLE,

		.step = 1,

	},

};



#define NUM_CTRLS ARRAY_SIZE(msm_vdec_ctrls)
@@ -2536,6 +2545,14 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		hal_property.enable = ctrl->val == V4L2_VIDC_QBUF_BATCHED;

		pdata = &hal_property;

		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_PRIORITY:

		property_id = HAL_CONFIG_REALTIME;

		/* firmware has inverted values for realtime and

		 * non-realtime priority

		 */

		hal_property.enable = !(ctrl->val);

		pdata = &hal_property;

		break;

	default:

		break;

	}

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

+17 −0
Original line number Diff line number Diff line
@@ -1130,6 +1130,15 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.step = 1,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_PRIORITY,

		.name = "Session Priority",

		.type = V4L2_CTRL_TYPE_BOOLEAN,

		.minimum = V4L2_MPEG_VIDC_VIDEO_PRIORITY_REALTIME_ENABLE,

		.maximum = V4L2_MPEG_VIDC_VIDEO_PRIORITY_REALTIME_DISABLE,

		.default_value = V4L2_MPEG_VIDC_VIDEO_PRIORITY_REALTIME_DISABLE,

		.step = 1,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_VQZIP_SEI,

		.name = "VQZIP SEI",
@@ -2888,6 +2897,14 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		enable.enable = ctrl->val;

		pdata = &enable;

		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_PRIORITY:

		property_id = HAL_CONFIG_REALTIME;

		/* firmware has inverted values for realtime and

		 * non-realtime priority

		 */

		enable.enable = !(ctrl->val);

		pdata = &enable;

		break;

	default:

		dprintk(VIDC_ERR, "Unsupported index: %x\n", ctrl->id);

		rc = -ENOTSUPP;

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

+19 −3
Original line number Diff line number Diff line
@@ -82,6 +82,16 @@ int msm_comm_g_ctrl(struct msm_vidc_inst *inst, int id) 
	return rc ?: ctrl.value;

}



static inline bool is_non_realtime_session(struct msm_vidc_inst *inst)

{

	int rc = 0;

	struct v4l2_control ctrl = {

		.id = V4L2_CID_MPEG_VIDC_VIDEO_PRIORITY

	};

	rc = v4l2_g_ctrl(&inst->ctrl_handler, &ctrl);

	return (!rc && ctrl.value);

}



enum multi_stream msm_comm_get_stream_output_mode(struct msm_vidc_inst *inst)

{

	switch (msm_comm_g_ctrl(inst,
@@ -108,6 +118,7 @@ int msm_comm_get_inst_load(struct msm_vidc_inst *inst, 
		enum load_calc_quirks quirks)

{

	int load = 0;



	if (!(inst->state >= MSM_VIDC_OPEN_DONE &&

		inst->state < MSM_VIDC_STOP_DONE))

		return 0;
@@ -124,6 +135,9 @@ int msm_comm_get_inst_load(struct msm_vidc_inst *inst, 
			load = inst->core->resources.max_load;

	}



	if (is_non_realtime_session(inst) &&

		(quirks & LOAD_CALC_IGNORE_NON_REALTIME_LOAD))

		load = msm_comm_get_mbs_per_sec(inst) / inst->prop.fps;

	return load;

}
@@ -2317,7 +2331,8 @@ static int msm_vidc_load_resources(int flipped_state, 
	int num_mbs_per_sec = 0;

	struct msm_vidc_core *core;

	enum load_calc_quirks quirks = LOAD_CALC_IGNORE_TURBO_LOAD |

		LOAD_CALC_IGNORE_THUMBNAIL_LOAD;

		LOAD_CALC_IGNORE_THUMBNAIL_LOAD |

		LOAD_CALC_IGNORE_NON_REALTIME_LOAD;



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

		dprintk(VIDC_ERR, "%s invalid parameters\n", __func__);
@@ -4332,7 +4347,8 @@ static int msm_vidc_load_supported(struct msm_vidc_inst *inst) 
{

	int num_mbs_per_sec = 0;

	enum load_calc_quirks quirks = LOAD_CALC_IGNORE_TURBO_LOAD |

		LOAD_CALC_IGNORE_THUMBNAIL_LOAD;

		LOAD_CALC_IGNORE_THUMBNAIL_LOAD |

		LOAD_CALC_IGNORE_NON_REALTIME_LOAD;



	if (inst->state == MSM_VIDC_OPEN_DONE) {

		num_mbs_per_sec = msm_comm_get_load(inst->core,

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

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ enum load_calc_quirks { 
	LOAD_CALC_NO_QUIRKS = 0,

	LOAD_CALC_IGNORE_TURBO_LOAD = 1 << 0,

	LOAD_CALC_IGNORE_THUMBNAIL_LOAD = 1 << 1,

	LOAD_CALC_IGNORE_NON_REALTIME_LOAD = 1 << 2,

};



struct msm_vidc_core *get_vidc_core(int core_id);