Commit 3f323bb4 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: get rid of set pipe version custom ctrl 



It doesn't make sense to have a control for that. Besides that,
the Intel Aero implementation doesn't have, which means that
even the custom control is not used in practice, at least
outside Android.

So, get rid of it.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 13d72e69

drivers/staging/media/atomisp/pci/atomisp_compat_css20.c

+0 −9
Original line number Diff line number Diff line
@@ -611,15 +611,6 @@ static void __apply_additional_pipe_config( 
		if (stream_env->pipe_configs[pipe_id].

		    default_capture_config.mode == IA_CSS_CAPTURE_MODE_RAW)

			stream_env->pipe_configs[pipe_id].enable_dz = false;



		if (IS_ISP2401) {

			/* the isp default to use ISP2.2 and the camera hal will

			* control whether use isp2.7 */

			if (asd->select_isp_version->val == ATOMISP_CSS_ISP_PIPE_VERSION_2_7)

				stream_env->pipe_configs[pipe_id].isp_pipe_version =  SH_CSS_ISP_PIPE_VERSION_2_7;

			else

				stream_env->pipe_configs[pipe_id].isp_pipe_version = SH_CSS_ISP_PIPE_VERSION_2_2;

		}

		break;

	case IA_CSS_PIPE_ID_VIDEO:

		/* enable reduced pipe to have binary

drivers/staging/media/atomisp/pci/atomisp_subdev.c

+0 −23
Original line number Diff line number Diff line
@@ -1058,24 +1058,6 @@ static const struct v4l2_ctrl_config ctrl_depth_mode = { 
	.def = 0,

};



/*

 * Control for selectting ISP version

 *

 * When enabled, that means ISP version will be used ISP2.7. when disable, the

 * isp will default to use ISP2.2.

 * Note: Make sure set this configuration before creating stream.

 */

static const struct v4l2_ctrl_config ctrl_select_isp_version = {

	.ops = &ctrl_ops,

	.id = V4L2_CID_ATOMISP_SELECT_ISP_VERSION,

	.type = V4L2_CTRL_TYPE_BOOLEAN,

	.name = "Select Isp version",

	.min = 0,

	.max = 1,

	.step = 1,

	.def = 0,

};



static void atomisp_init_subdev_pipe(struct atomisp_sub_device *asd,

				     struct atomisp_video_pipe *pipe, enum v4l2_buf_type buf_type)

{
@@ -1223,11 +1205,6 @@ static int isp_subdev_init_entities(struct atomisp_sub_device *asd) 
	    v4l2_ctrl_new_custom(&asd->ctrl_handler,

				 &ctrl_disable_dz,

				 NULL);

	if (IS_ISP2401) {

		asd->select_isp_version = v4l2_ctrl_new_custom(&asd->ctrl_handler,

							       &ctrl_select_isp_version,

							       NULL);

	}



	/* Make controls visible on subdev as well. */

	asd->subdev.ctrl_handler = &asd->ctrl_handler;

drivers/staging/media/atomisp/pci/atomisp_subdev.h

+0 −1
Original line number Diff line number Diff line
@@ -319,7 +319,6 @@ struct atomisp_sub_device { 


	/* ISP2401 */

	struct v4l2_ctrl *ion_dev_fd;

	struct v4l2_ctrl *select_isp_version;



	struct v4l2_ctrl *disable_dz;