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

Commit 84c8d706 authored by Vaibhav Deshu Venkatesh's avatar Vaibhav Deshu Venkatesh
Browse files

msm: vidc: Cleanup extended controls 



Set/Get extendec controls and get crop ioctls are no longer
supported or needed. These calls are removed from driver.

CRs-Fixed: 2368458
Change-Id: Ia14b80abff4a50c9e9eb3b9cb032376df9863584
Signed-off-by: default avatarVaibhav Deshu Venkatesh <vdeshuve@codeaurora.org>
parent d25fbc3d

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

+1 −28
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 */



#include <linux/debugfs.h>
@@ -122,22 +122,6 @@ int msm_v4l2_g_ctrl(struct file *file, void *fh, 
	return msm_vidc_g_ctrl((void *)vidc_inst, a);

}



int msm_v4l2_s_ext_ctrl(struct file *file, void *fh,

					struct v4l2_ext_controls *a)

{

	struct msm_vidc_inst *vidc_inst = get_vidc_inst(file, fh);



	return msm_vidc_s_ext_ctrl((void *)vidc_inst, a);

}



int msm_v4l2_g_ext_ctrl(struct file *file, void *fh,

					struct v4l2_ext_controls *a)

{

	struct msm_vidc_inst *vidc_inst = get_vidc_inst(file, fh);



	return msm_vidc_g_ext_ctrl((void *)vidc_inst, a);

}



int msm_v4l2_reqbufs(struct file *file, void *fh,

				struct v4l2_requestbuffers *b)

{
@@ -222,14 +206,6 @@ static int msm_v4l2_g_parm(struct file *file, void *fh, 
	return 0;

}



static int msm_v4l2_g_crop(struct file *file, void *fh,

			struct v4l2_crop *a)

{

	struct msm_vidc_inst *vidc_inst = get_vidc_inst(file, fh);



	return msm_vidc_g_crop(vidc_inst, a);

}



static int msm_v4l2_enum_framesizes(struct file *file, void *fh,

				struct v4l2_frmsizeenum *fsize)

{
@@ -271,15 +247,12 @@ const struct v4l2_ioctl_ops msm_v4l2_ioctl_ops = { 
	.vidioc_s_ctrl = msm_v4l2_s_ctrl,

	.vidioc_g_ctrl = msm_v4l2_g_ctrl,

	.vidioc_queryctrl = msm_v4l2_queryctrl,

	.vidioc_s_ext_ctrls = msm_v4l2_s_ext_ctrl,

	.vidioc_g_ext_ctrls = msm_v4l2_g_ext_ctrl,

	.vidioc_subscribe_event = msm_v4l2_subscribe_event,

	.vidioc_unsubscribe_event = msm_v4l2_unsubscribe_event,

	.vidioc_decoder_cmd = msm_v4l2_decoder_cmd,

	.vidioc_encoder_cmd = msm_v4l2_encoder_cmd,

	.vidioc_s_parm = msm_v4l2_s_parm,

	.vidioc_g_parm = msm_v4l2_g_parm,

	.vidioc_g_crop = msm_v4l2_g_crop,

	.vidioc_enum_framesizes = msm_v4l2_enum_framesizes,

	.vidioc_default = msm_v4l2_default,

};

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

+0 −60
Original line number Diff line number Diff line
@@ -317,29 +317,6 @@ int msm_vidc_s_ctrl(void *instance, struct v4l2_control *control) 
}

EXPORT_SYMBOL(msm_vidc_s_ctrl);



int msm_vidc_g_crop(void *instance, struct v4l2_crop *crop)

{

	struct msm_vidc_inst *inst = instance;



	if (!inst || !crop)

		return -EINVAL;



	if (inst->session_type == MSM_VIDC_ENCODER) {

		dprintk(VIDC_ERR,

			"Session = %pK : Encoder Crop is not implemented yet\n",

				inst);

		return -EPERM;

	}



	crop->c.left = inst->prop.crop_info.left;

	crop->c.top = inst->prop.crop_info.top;

	crop->c.width = inst->prop.crop_info.width;

	crop->c.height = inst->prop.crop_info.height;



	return 0;

}

EXPORT_SYMBOL(msm_vidc_g_crop);



int msm_vidc_g_ctrl(void *instance, struct v4l2_control *control)

{

	struct msm_vidc_inst *inst = instance;
@@ -360,43 +337,6 @@ int msm_vidc_g_ctrl(void *instance, struct v4l2_control *control) 
}

EXPORT_SYMBOL(msm_vidc_g_ctrl);



int msm_vidc_g_ext_ctrl(void *instance, struct v4l2_ext_controls *control)

{

	struct msm_vidc_inst *inst = instance;

	struct v4l2_ext_control *ext_control;

	unsigned int i = 0;

	int rc = 0;



	if (!inst || !control)

		return -EINVAL;



	ext_control = control->controls;



	for (i = 0; i < control->count; i++) {

		switch (ext_control[i].id) {

		default:

			dprintk(VIDC_ERR,

				"This control %x is not supported yet\n",

					ext_control[i].id);

			break;

		}

	}

	return rc;

}

EXPORT_SYMBOL(msm_vidc_g_ext_ctrl);



int msm_vidc_s_ext_ctrl(void *instance, struct v4l2_ext_controls *control)

{

	struct msm_vidc_inst *inst = instance;



	if (!inst || !control)

		return -EINVAL;



	dprintk(VIDC_ERR, "Extended controls are not supported");

	return -EINVAL;

}

EXPORT_SYMBOL(msm_vidc_s_ext_ctrl);



int msm_vidc_reqbufs(void *instance, struct v4l2_requestbuffers *b)

{

	struct msm_vidc_inst *inst = instance;