Commit 10d5509c authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2: remove g/s_crop from video ops 



Replace all calls to g/s_crop by calls to the get/set_selection pad ops.

Remove the old g/s_crop video ops since they are now no longer used.

The cropcap video op is now only used to pass pixelaspect information,
and is only needed if the pixelaspect is not 1:1.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 65d9e14a

drivers/media/i2c/ak881x.c

+17 −11
Original line number Diff line number Diff line
@@ -124,21 +124,27 @@ static int ak881x_enum_mbus_code(struct v4l2_subdev *sd, 
	return 0;

}



static int ak881x_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)

static int ak881x_get_selection(struct v4l2_subdev *sd,

				struct v4l2_subdev_pad_config *cfg,

				struct v4l2_subdev_selection *sel)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct ak881x *ak881x = to_ak881x(client);



	a->bounds.left			= 0;

	a->bounds.top			= 0;

	a->bounds.width			= 720;

	a->bounds.height		= ak881x->lines;

	a->defrect			= a->bounds;

	a->type				= V4L2_BUF_TYPE_VIDEO_OUTPUT;

	a->pixelaspect.numerator	= 1;

	a->pixelaspect.denominator	= 1;

	if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE)

		return -EINVAL;



	switch (sel->target) {

	case V4L2_SEL_TGT_CROP_BOUNDS:

	case V4L2_SEL_TGT_CROP_DEFAULT:

		sel->r.left = 0;

		sel->r.top = 0;

		sel->r.width = 720;

		sel->r.height = ak881x->lines;

		return 0;

	default:

		return -EINVAL;

	}

}



static int ak881x_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
@@ -207,13 +213,13 @@ static struct v4l2_subdev_core_ops ak881x_subdev_core_ops = { 
};



static struct v4l2_subdev_video_ops ak881x_subdev_video_ops = {

	.cropcap	= ak881x_cropcap,

	.s_std_output	= ak881x_s_std_output,

	.s_stream	= ak881x_s_stream,

};



static const struct v4l2_subdev_pad_ops ak881x_subdev_pad_ops = {

	.enum_mbus_code = ak881x_enum_mbus_code,

	.get_selection	= ak881x_get_selection,

	.set_fmt	= ak881x_fill_fmt,

	.get_fmt	= ak881x_fill_fmt,

};

drivers/media/i2c/soc_camera/imx074.c

+18 −24
Original line number Diff line number Diff line
@@ -209,31 +209,26 @@ static int imx074_get_fmt(struct v4l2_subdev *sd, 
	return 0;

}



static int imx074_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)

static int imx074_get_selection(struct v4l2_subdev *sd,

				struct v4l2_subdev_pad_config *cfg,

				struct v4l2_subdev_selection *sel)

{

	struct v4l2_rect *rect = &a->c;

	if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE)

		return -EINVAL;



	a->type		= V4L2_BUF_TYPE_VIDEO_CAPTURE;

	rect->top	= 0;

	rect->left	= 0;

	rect->width	= IMX074_WIDTH;

	rect->height	= IMX074_HEIGHT;

	sel->r.left = 0;

	sel->r.top = 0;

	sel->r.width = IMX074_WIDTH;

	sel->r.height = IMX074_HEIGHT;



	switch (sel->target) {

	case V4L2_SEL_TGT_CROP_BOUNDS:

	case V4L2_SEL_TGT_CROP_DEFAULT:

	case V4L2_SEL_TGT_CROP:

		return 0;

	default:

		return -EINVAL;

	}



static int imx074_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)

{

	a->bounds.left			= 0;

	a->bounds.top			= 0;

	a->bounds.width			= IMX074_WIDTH;

	a->bounds.height		= IMX074_HEIGHT;

	a->defrect			= a->bounds;

	a->type				= V4L2_BUF_TYPE_VIDEO_CAPTURE;

	a->pixelaspect.numerator	= 1;

	a->pixelaspect.denominator	= 1;



	return 0;

}



static int imx074_enum_mbus_code(struct v4l2_subdev *sd,
@@ -278,8 +273,6 @@ static int imx074_g_mbus_config(struct v4l2_subdev *sd, 


static struct v4l2_subdev_video_ops imx074_subdev_video_ops = {

	.s_stream	= imx074_s_stream,

	.g_crop		= imx074_g_crop,

	.cropcap	= imx074_cropcap,

	.g_mbus_config	= imx074_g_mbus_config,

};
@@ -289,6 +282,7 @@ static struct v4l2_subdev_core_ops imx074_subdev_core_ops = { 


static const struct v4l2_subdev_pad_ops imx074_subdev_pad_ops = {

	.enum_mbus_code = imx074_enum_mbus_code,

	.get_selection	= imx074_get_selection,

	.get_fmt	= imx074_get_fmt,

	.set_fmt	= imx074_set_fmt,

};

drivers/media/i2c/soc_camera/mt9m001.c

+38 −32
Original line number Diff line number Diff line
@@ -171,13 +171,19 @@ static int mt9m001_s_stream(struct v4l2_subdev *sd, int enable) 
	return 0;

}



static int mt9m001_s_crop(struct v4l2_subdev *sd, const struct v4l2_crop *a)

static int mt9m001_set_selection(struct v4l2_subdev *sd,

		struct v4l2_subdev_pad_config *cfg,

		struct v4l2_subdev_selection *sel)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m001 *mt9m001 = to_mt9m001(client);

	struct v4l2_rect rect = a->c;

	int ret;

	struct v4l2_rect rect = sel->r;

	const u16 hblank = 9, vblank = 25;

	int ret;



	if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE ||

	    sel->target != V4L2_SEL_TGT_CROP)

		return -EINVAL;



	if (mt9m001->fmts == mt9m001_colour_fmts)

		/*
@@ -225,29 +231,30 @@ static int mt9m001_s_crop(struct v4l2_subdev *sd, const struct v4l2_crop *a) 
	return ret;

}



static int mt9m001_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)

static int mt9m001_get_selection(struct v4l2_subdev *sd,

		struct v4l2_subdev_pad_config *cfg,

		struct v4l2_subdev_selection *sel)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m001 *mt9m001 = to_mt9m001(client);



	a->c	= mt9m001->rect;

	a->type	= V4L2_BUF_TYPE_VIDEO_CAPTURE;

	if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE)

		return -EINVAL;



	switch (sel->target) {

	case V4L2_SEL_TGT_CROP_BOUNDS:

	case V4L2_SEL_TGT_CROP_DEFAULT:

		sel->r.left = MT9M001_COLUMN_SKIP;

		sel->r.top = MT9M001_ROW_SKIP;

		sel->r.width = MT9M001_MAX_WIDTH;

		sel->r.height = MT9M001_MAX_HEIGHT;

		return 0;

}



static int mt9m001_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)

{

	a->bounds.left			= MT9M001_COLUMN_SKIP;

	a->bounds.top			= MT9M001_ROW_SKIP;

	a->bounds.width			= MT9M001_MAX_WIDTH;

	a->bounds.height		= MT9M001_MAX_HEIGHT;

	a->defrect			= a->bounds;

	a->type				= V4L2_BUF_TYPE_VIDEO_CAPTURE;

	a->pixelaspect.numerator	= 1;

	a->pixelaspect.denominator	= 1;



	case V4L2_SEL_TGT_CROP:

		sel->r = mt9m001->rect;

		return 0;

	default:

		return -EINVAL;

	}

}



static int mt9m001_get_fmt(struct v4l2_subdev *sd,
@@ -275,18 +282,18 @@ static int mt9m001_s_fmt(struct v4l2_subdev *sd, 
{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m001 *mt9m001 = to_mt9m001(client);

	struct v4l2_crop a = {

		.c = {

			.left	= mt9m001->rect.left,

			.top	= mt9m001->rect.top,

			.width	= mf->width,

			.height	= mf->height,

		},

	struct v4l2_subdev_selection sel = {

		.which = V4L2_SUBDEV_FORMAT_ACTIVE,

		.target = V4L2_SEL_TGT_CROP,

		.r.left = mt9m001->rect.left,

		.r.top = mt9m001->rect.top,

		.r.width = mf->width,

		.r.height = mf->height,

	};

	int ret;



	/* No support for scaling so far, just crop. TODO: use skipping */

	ret = mt9m001_s_crop(sd, &a);

	ret = mt9m001_set_selection(sd, NULL, &sel);

	if (!ret) {

		mf->width	= mt9m001->rect.width;

		mf->height	= mt9m001->rect.height;
@@ -625,9 +632,6 @@ static int mt9m001_s_mbus_config(struct v4l2_subdev *sd, 


static struct v4l2_subdev_video_ops mt9m001_subdev_video_ops = {

	.s_stream	= mt9m001_s_stream,

	.s_crop		= mt9m001_s_crop,

	.g_crop		= mt9m001_g_crop,

	.cropcap	= mt9m001_cropcap,

	.g_mbus_config	= mt9m001_g_mbus_config,

	.s_mbus_config	= mt9m001_s_mbus_config,

};
@@ -638,6 +642,8 @@ static const struct v4l2_subdev_sensor_ops mt9m001_subdev_sensor_ops = { 


static const struct v4l2_subdev_pad_ops mt9m001_subdev_pad_ops = {

	.enum_mbus_code = mt9m001_enum_mbus_code,

	.get_selection	= mt9m001_get_selection,

	.set_selection	= mt9m001_set_selection,

	.get_fmt	= mt9m001_get_fmt,

	.set_fmt	= mt9m001_set_fmt,

};

drivers/media/i2c/soc_camera/mt9m111.c

+30 −27
Original line number Diff line number Diff line
@@ -383,14 +383,18 @@ static int mt9m111_reset(struct mt9m111 *mt9m111) 
	return ret;

}



static int mt9m111_s_crop(struct v4l2_subdev *sd, const struct v4l2_crop *a)

static int mt9m111_set_selection(struct v4l2_subdev *sd,

				 struct v4l2_subdev_pad_config *cfg,

				 struct v4l2_subdev_selection *sel)

{

	struct v4l2_rect rect = a->c;

	struct mt9m111 *mt9m111 = container_of(sd, struct mt9m111, subdev);

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m111 *mt9m111 = to_mt9m111(client);

	struct v4l2_rect rect = sel->r;

	int width, height;

	int ret;



	if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

	if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE ||

	    sel->target != V4L2_SEL_TGT_CROP)

		return -EINVAL;



	if (mt9m111->fmt->code == MEDIA_BUS_FMT_SBGGR8_1X8 ||
@@ -421,30 +425,30 @@ static int mt9m111_s_crop(struct v4l2_subdev *sd, const struct v4l2_crop *a) 
	return ret;

}



static int mt9m111_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)

static int mt9m111_get_selection(struct v4l2_subdev *sd,

				 struct v4l2_subdev_pad_config *cfg,

				 struct v4l2_subdev_selection *sel)

{

	struct mt9m111 *mt9m111 = container_of(sd, struct mt9m111, subdev);



	a->c	= mt9m111->rect;

	a->type	= V4L2_BUF_TYPE_VIDEO_CAPTURE;



	return 0;

}

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m111 *mt9m111 = to_mt9m111(client);



static int mt9m111_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)

{

	if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

	if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE)

		return -EINVAL;



	a->bounds.left			= MT9M111_MIN_DARK_COLS;

	a->bounds.top			= MT9M111_MIN_DARK_ROWS;

	a->bounds.width			= MT9M111_MAX_WIDTH;

	a->bounds.height		= MT9M111_MAX_HEIGHT;

	a->defrect			= a->bounds;

	a->pixelaspect.numerator	= 1;

	a->pixelaspect.denominator	= 1;



	switch (sel->target) {

	case V4L2_SEL_TGT_CROP_BOUNDS:

	case V4L2_SEL_TGT_CROP_DEFAULT:

		sel->r.left = MT9M111_MIN_DARK_COLS;

		sel->r.top = MT9M111_MIN_DARK_ROWS;

		sel->r.width = MT9M111_MAX_WIDTH;

		sel->r.height = MT9M111_MAX_HEIGHT;

		return 0;

	case V4L2_SEL_TGT_CROP:

		sel->r = mt9m111->rect;

		return 0;

	default:

		return -EINVAL;

	}

}



static int mt9m111_get_fmt(struct v4l2_subdev *sd,
@@ -867,14 +871,13 @@ static int mt9m111_g_mbus_config(struct v4l2_subdev *sd, 
}



static struct v4l2_subdev_video_ops mt9m111_subdev_video_ops = {

	.s_crop		= mt9m111_s_crop,

	.g_crop		= mt9m111_g_crop,

	.cropcap	= mt9m111_cropcap,

	.g_mbus_config	= mt9m111_g_mbus_config,

};



static const struct v4l2_subdev_pad_ops mt9m111_subdev_pad_ops = {

	.enum_mbus_code = mt9m111_enum_mbus_code,

	.get_selection	= mt9m111_get_selection,

	.set_selection	= mt9m111_set_selection,

	.get_fmt	= mt9m111_get_fmt,

	.set_fmt	= mt9m111_set_fmt,

};

drivers/media/i2c/soc_camera/mt9t031.c

+30 −24
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int mt9t031_set_params(struct i2c_client *client, 


	/*

	 * The caller provides a supported format, as guaranteed by

	 * .set_fmt(FORMAT_TRY), soc_camera_s_crop() and soc_camera_cropcap()

	 * .set_fmt(FORMAT_TRY), soc_camera_s_selection() and soc_camera_cropcap()

	 */

	if (ret >= 0)

		ret = reg_write(client, MT9T031_COLUMN_START, rect->left);
@@ -294,11 +294,17 @@ static int mt9t031_set_params(struct i2c_client *client, 
	return ret < 0 ? ret : 0;

}



static int mt9t031_s_crop(struct v4l2_subdev *sd, const struct v4l2_crop *a)

static int mt9t031_set_selection(struct v4l2_subdev *sd,

		struct v4l2_subdev_pad_config *cfg,

		struct v4l2_subdev_selection *sel)

{

	struct v4l2_rect rect = a->c;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9t031 *mt9t031 = to_mt9t031(client);

	struct v4l2_rect rect = sel->r;



	if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE ||

	    sel->target != V4L2_SEL_TGT_CROP)

		return -EINVAL;



	rect.width = ALIGN(rect.width, 2);

	rect.height = ALIGN(rect.height, 2);
@@ -312,29 +318,30 @@ static int mt9t031_s_crop(struct v4l2_subdev *sd, const struct v4l2_crop *a) 
	return mt9t031_set_params(client, &rect, mt9t031->xskip, mt9t031->yskip);

}



static int mt9t031_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)

static int mt9t031_get_selection(struct v4l2_subdev *sd,

		struct v4l2_subdev_pad_config *cfg,

		struct v4l2_subdev_selection *sel)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9t031 *mt9t031 = to_mt9t031(client);



	a->c	= mt9t031->rect;

	a->type	= V4L2_BUF_TYPE_VIDEO_CAPTURE;

	if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE)

		return -EINVAL;



	switch (sel->target) {

	case V4L2_SEL_TGT_CROP_BOUNDS:

	case V4L2_SEL_TGT_CROP_DEFAULT:

		sel->r.left = MT9T031_COLUMN_SKIP;

		sel->r.top = MT9T031_ROW_SKIP;

		sel->r.width = MT9T031_MAX_WIDTH;

		sel->r.height = MT9T031_MAX_HEIGHT;

		return 0;

}



static int mt9t031_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)

{

	a->bounds.left			= MT9T031_COLUMN_SKIP;

	a->bounds.top			= MT9T031_ROW_SKIP;

	a->bounds.width			= MT9T031_MAX_WIDTH;

	a->bounds.height		= MT9T031_MAX_HEIGHT;

	a->defrect			= a->bounds;

	a->type				= V4L2_BUF_TYPE_VIDEO_CAPTURE;

	a->pixelaspect.numerator	= 1;

	a->pixelaspect.denominator	= 1;



	case V4L2_SEL_TGT_CROP:

		sel->r = mt9t031->rect;

		return 0;

	default:

		return -EINVAL;

	}

}



static int mt9t031_get_fmt(struct v4l2_subdev *sd,
@@ -721,9 +728,6 @@ static int mt9t031_s_mbus_config(struct v4l2_subdev *sd, 


static struct v4l2_subdev_video_ops mt9t031_subdev_video_ops = {

	.s_stream	= mt9t031_s_stream,

	.s_crop		= mt9t031_s_crop,

	.g_crop		= mt9t031_g_crop,

	.cropcap	= mt9t031_cropcap,

	.g_mbus_config	= mt9t031_g_mbus_config,

	.s_mbus_config	= mt9t031_s_mbus_config,

};
@@ -734,6 +738,8 @@ static const struct v4l2_subdev_sensor_ops mt9t031_subdev_sensor_ops = { 


static const struct v4l2_subdev_pad_ops mt9t031_subdev_pad_ops = {

	.enum_mbus_code = mt9t031_enum_mbus_code,

	.get_selection	= mt9t031_get_selection,

	.set_selection	= mt9t031_set_selection,

	.get_fmt	= mt9t031_get_fmt,

	.set_fmt	= mt9t031_set_fmt,

};