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

Commit 56924e7e 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: Initialize v4l2 private controls" into msm-4.9

parents 2c26beb9 1f801498

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

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ int msm_comm_ctrl_init(struct msm_vidc_inst *inst, 
	for (; idx < num_ctrls; idx++) {

		struct v4l2_ctrl *ctrl = NULL;



		if (1) {

		if (IS_PRIV_CTRL(drv_ctrls[idx].id)) {

			/*add private control*/

			ctrl_cfg.def = drv_ctrls[idx].default_value;

			ctrl_cfg.flags = 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ enum hal_extradata_id msm_comm_get_hal_extradata_index( 
struct hal_buffer_requirements *get_buff_req_buffer(

			struct msm_vidc_inst *inst, u32 buffer_type);

#define IS_PRIV_CTRL(idx) (\

		(V4L2_CTRL_ID2CLASS(idx) == V4L2_CTRL_CLASS_MPEG) && \

		(V4L2_CTRL_ID2WHICH(idx) == V4L2_CTRL_CLASS_MPEG) && \

		V4L2_CTRL_DRIVER_PRIV(idx))

void msm_comm_session_clean(struct msm_vidc_inst *inst);

int msm_comm_kill_session(struct msm_vidc_inst *inst);