Commit 3b378b35 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: ov2680: Implement selection support 



Implement selection support. Modelled after ov5693 selection support,
but allow setting sizes smaller than crop-size through set_fmt() since
that was already allowed.

Acked-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Reviewed-by: default avatarDaniel Scally <dan.scally@ideasonboard.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 23321b91

drivers/media/i2c/ov2680.c

+141 −12
Original line number Diff line number Diff line
@@ -65,8 +65,14 @@ 


#define OV2680_NATIVE_WIDTH			1616

#define OV2680_NATIVE_HEIGHT			1216

#define OV2680_NATIVE_START_LEFT		0

#define OV2680_NATIVE_START_TOP			0

#define OV2680_ACTIVE_WIDTH			1600

#define OV2680_ACTIVE_HEIGHT			1200

#define OV2680_ACTIVE_START_LEFT		8

#define OV2680_ACTIVE_START_TOP			8

#define OV2680_MIN_CROP_WIDTH			2

#define OV2680_MIN_CROP_HEIGHT			2



/* 66MHz pixel clock: 66MHz / 1704 * 1294 = 30fps */

#define OV2680_PIXELS_PER_LINE			1704
@@ -114,6 +120,7 @@ struct ov2680_ctrls { 
};



struct ov2680_mode {

	struct v4l2_rect		crop;

	struct v4l2_mbus_framefmt	fmt;

	struct v4l2_fract		frame_interval;

	bool				binning;
@@ -147,6 +154,13 @@ struct ov2680_dev { 
	struct ov2680_mode		mode;

};



static const struct v4l2_rect ov2680_default_crop = {

	.left = OV2680_ACTIVE_START_LEFT,

	.top = OV2680_ACTIVE_START_TOP,

	.width = OV2680_ACTIVE_WIDTH,

	.height = OV2680_ACTIVE_HEIGHT,

};



static const char * const test_pattern_menu[] = {

	"Disabled",

	"Color Bars",
@@ -232,6 +246,18 @@ __ov2680_get_pad_format(struct ov2680_dev *sensor, 
	return &sensor->mode.fmt;

}



static struct v4l2_rect *

__ov2680_get_pad_crop(struct ov2680_dev *sensor,

		      struct v4l2_subdev_state *state,

		      unsigned int pad,

		      enum v4l2_subdev_format_whence which)

{

	if (which == V4L2_SUBDEV_FORMAT_TRY)

		return v4l2_subdev_get_try_crop(&sensor->sd, state, pad);



	return &sensor->mode.crop;

}



static void ov2680_fill_format(struct ov2680_dev *sensor,

			       struct v4l2_mbus_framefmt *fmt,

			       unsigned int width, unsigned int height)
@@ -251,8 +277,8 @@ static void ov2680_calc_mode(struct ov2680_dev *sensor) 
	int orig_width = width;

	int orig_height = height;



	if (width  <= (OV2680_NATIVE_WIDTH / 2) &&

	    height <= (OV2680_NATIVE_HEIGHT / 2)) {

	if (width  <= (sensor->mode.crop.width / 2) &&

	    height <= (sensor->mode.crop.height / 2)) {

		sensor->mode.binning = true;

		width *= 2;

		height *= 2;
@@ -260,8 +286,10 @@ static void ov2680_calc_mode(struct ov2680_dev *sensor) 
		sensor->mode.binning = false;

	}



	sensor->mode.h_start = ((OV2680_NATIVE_WIDTH - width) / 2) & ~1;

	sensor->mode.v_start = ((OV2680_NATIVE_HEIGHT - height) / 2) & ~1;

	sensor->mode.h_start = (sensor->mode.crop.left +

				(sensor->mode.crop.width - width) / 2) & ~1;

	sensor->mode.v_start = (sensor->mode.crop.top +

				(sensor->mode.crop.height - height) / 2) & ~1;

	sensor->mode.h_end =

		min(sensor->mode.h_start + width + OV2680_END_MARGIN - 1,

		    OV2680_NATIVE_WIDTH - 1);
@@ -541,16 +569,21 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, 
{

	struct ov2680_dev *sensor = to_ov2680_dev(sd);

	struct v4l2_mbus_framefmt *try_fmt;

	const struct v4l2_rect *crop;

	unsigned int width, height;

	int ret = 0;



	if (format->pad != 0)

		return -EINVAL;



	width = min_t(unsigned int, ALIGN(format->format.width, 2),

		      OV2680_NATIVE_WIDTH);

	height = min_t(unsigned int, ALIGN(format->format.height, 2),

		       OV2680_NATIVE_HEIGHT);

	crop = __ov2680_get_pad_crop(sensor, sd_state, format->pad,

				     format->which);



	/* Limit set_fmt max size to crop width / height */

	width = clamp_val(ALIGN(format->format.width, 2),

			  OV2680_MIN_CROP_WIDTH, crop->width);

	height = clamp_val(ALIGN(format->format.height, 2),

			   OV2680_MIN_CROP_HEIGHT, crop->height);



	ov2680_fill_format(sensor, &format->format, width, height);
@@ -576,11 +609,97 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, 
	return ret;

}



static int ov2680_get_selection(struct v4l2_subdev *sd,

				struct v4l2_subdev_state *state,

				struct v4l2_subdev_selection *sel)

{

	struct ov2680_dev *sensor = to_ov2680_dev(sd);



	switch (sel->target) {

	case V4L2_SEL_TGT_CROP:

		mutex_lock(&sensor->lock);

		sel->r = *__ov2680_get_pad_crop(sensor, state, sel->pad,

						sel->which);

		mutex_unlock(&sensor->lock);

		break;

	case V4L2_SEL_TGT_NATIVE_SIZE:

	case V4L2_SEL_TGT_CROP_BOUNDS:

		sel->r.top = 0;

		sel->r.left = 0;

		sel->r.width = OV2680_NATIVE_WIDTH;

		sel->r.height = OV2680_NATIVE_HEIGHT;

		break;

	case V4L2_SEL_TGT_CROP_DEFAULT:

		sel->r = ov2680_default_crop;

		break;

	default:

		return -EINVAL;

	}



	return 0;

}



static int ov2680_set_selection(struct v4l2_subdev *sd,

				struct v4l2_subdev_state *state,

				struct v4l2_subdev_selection *sel)

{

	struct ov2680_dev *sensor = to_ov2680_dev(sd);

	struct v4l2_mbus_framefmt *format;

	struct v4l2_rect *crop;

	struct v4l2_rect rect;



	if (sel->target != V4L2_SEL_TGT_CROP)

		return -EINVAL;



	/*

	 * Clamp the boundaries of the crop rectangle to the size of the sensor

	 * pixel array. Align to multiples of 2 to ensure Bayer pattern isn't

	 * disrupted.

	 */

	rect.left = clamp_val(ALIGN(sel->r.left, 2),

			      OV2680_NATIVE_START_LEFT, OV2680_NATIVE_WIDTH);

	rect.top = clamp_val(ALIGN(sel->r.top, 2),

			     OV2680_NATIVE_START_TOP, OV2680_NATIVE_HEIGHT);

	rect.width = clamp_val(ALIGN(sel->r.width, 2),

			       OV2680_MIN_CROP_WIDTH, OV2680_NATIVE_WIDTH);

	rect.height = clamp_val(ALIGN(sel->r.height, 2),

				OV2680_MIN_CROP_HEIGHT, OV2680_NATIVE_HEIGHT);



	/* Make sure the crop rectangle isn't outside the bounds of the array */

	rect.width = min_t(unsigned int, rect.width,

			   OV2680_NATIVE_WIDTH - rect.left);

	rect.height = min_t(unsigned int, rect.height,

			    OV2680_NATIVE_HEIGHT - rect.top);



	crop = __ov2680_get_pad_crop(sensor, state, sel->pad, sel->which);



	mutex_lock(&sensor->lock);

	if (rect.width != crop->width || rect.height != crop->height) {

		/*

		 * Reset the output image size if the crop rectangle size has

		 * been modified.

		 */

		format = __ov2680_get_pad_format(sensor, state, sel->pad,

						 sel->which);

		format->width = rect.width;

		format->height = rect.height;

	}



	*crop = rect;

	mutex_unlock(&sensor->lock);



	sel->r = rect;



	return 0;

}



static int ov2680_init_cfg(struct v4l2_subdev *sd,

			   struct v4l2_subdev_state *sd_state)

{

	struct ov2680_dev *sensor = to_ov2680_dev(sd);



	sd_state->pads[0].try_crop = ov2680_default_crop;



	ov2680_fill_format(sensor, &sd_state->pads[0].try_fmt,

			   OV2680_DEFAULT_WIDTH, OV2680_DEFAULT_HEIGHT);

	return 0;
@@ -590,11 +709,18 @@ static int ov2680_enum_frame_size(struct v4l2_subdev *sd, 
				  struct v4l2_subdev_state *sd_state,

				  struct v4l2_subdev_frame_size_enum *fse)

{

	struct ov2680_dev *sensor = to_ov2680_dev(sd);

	struct v4l2_rect *crop;



	if (fse->index >= OV2680_FRAME_SIZES)

		return -EINVAL;



	fse->min_width = OV2680_ACTIVE_WIDTH / (fse->index + 1);

	fse->min_height = OV2680_ACTIVE_HEIGHT / (fse->index + 1);

	crop = __ov2680_get_pad_crop(sensor, sd_state, fse->pad, fse->which);

	if (!crop)

		return -EINVAL;



	fse->min_width = crop->width / (fse->index + 1);

	fse->min_height = crop->height / (fse->index + 1);

	fse->max_width = fse->min_width;

	fse->max_height = fse->min_height;
@@ -690,10 +816,12 @@ static const struct v4l2_subdev_video_ops ov2680_video_ops = { 
static const struct v4l2_subdev_pad_ops ov2680_pad_ops = {

	.init_cfg		= ov2680_init_cfg,

	.enum_mbus_code		= ov2680_enum_mbus_code,

	.get_fmt		= ov2680_get_fmt,

	.set_fmt		= ov2680_set_fmt,

	.enum_frame_size	= ov2680_enum_frame_size,

	.enum_frame_interval	= ov2680_enum_frame_interval,

	.get_fmt		= ov2680_get_fmt,

	.set_fmt		= ov2680_set_fmt,

	.get_selection		= ov2680_get_selection,

	.set_selection		= ov2680_set_selection,

};



static const struct v4l2_subdev_ops ov2680_subdev_ops = {
@@ -704,6 +832,7 @@ static const struct v4l2_subdev_ops ov2680_subdev_ops = { 
static int ov2680_mode_init(struct ov2680_dev *sensor)

{

	/* set initial mode */

	sensor->mode.crop = ov2680_default_crop;

	ov2680_fill_format(sensor, &sensor->mode.fmt,

			   OV2680_DEFAULT_WIDTH, OV2680_DEFAULT_HEIGHT);

	ov2680_calc_mode(sensor);