Commit d0bb6f1f authored by Hans de Goede's avatar Hans de Goede Committed by Hans Verkuil
Browse files

media: ov02c10: Adjust x-win/y-win when changing flipping to preserve bayer-pattern 



The ov02c10 is capable of having its (crop) window shifted around with 1
pixel precision while streaming.

This allows changing the x/y window coordinates when changing flipping to
preserve the bayer-pattern.

__v4l2_ctrl_handler_setup() will now write the window coordinates at 0x3810
and 0x3812 so these can be dropped from sensor_1928x1092_30fps_setting.

Since the bayer-pattern is now unchanged, the V4L2_CTRL_FLAG_MODIFY_LAYOUT
flag can be dropped from the flip controls.

Note the original use of the V4L2_CTRL_FLAG_MODIFY_LAYOUT flag was
incomplete, besides setting the flag the driver should also have reported
a different mbus code when getting the source pad's format depending on
the hflip / vflip settings see the ov2680.c driver for example.

Fixes: b7cd2ba3 ("media: ov02c10: Support hflip and vflip")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarBryan O'Donoghue <bod@kernel.org>
Reviewed-by: default avatarSebastian Reichel <sre@kernel.org>
Tested-by: Sebastian Reichel <sre@kernel.org> # T14s Gen6 Snapdragon
Signed-off-by: default avatarHans de Goede <johannes.goede@oss.qualcomm.com>
Signed-off-by: default avatarHans Verkuil <hverkuil+cisco@kernel.org>
parent 905120d7

drivers/media/i2c/ov02c10.c

+4 −8
Original line number Diff line number Diff line
@@ -165,10 +165,6 @@ static const struct reg_sequence sensor_1928x1092_30fps_setting[] = { 
	{0x3809, 0x88},

	{0x380a, 0x04},

	{0x380b, 0x44},

	{0x3810, 0x00},

	{0x3811, 0x02},

	{0x3812, 0x00},

	{0x3813, 0x01},

	{0x3814, 0x01},

	{0x3815, 0x01},

	{0x3816, 0x01},
@@ -465,11 +461,15 @@ static int ov02c10_set_ctrl(struct v4l2_ctrl *ctrl) 
		break;



	case V4L2_CID_HFLIP:

		cci_write(ov02c10->regmap, OV02C10_ISP_X_WIN_CONTROL,

			  ctrl->val ? 1 : 2, &ret);

		cci_update_bits(ov02c10->regmap, OV02C10_ROTATE_CONTROL,

				BIT(3), ov02c10->hflip->val << 3, &ret);

		break;



	case V4L2_CID_VFLIP:

		cci_write(ov02c10->regmap, OV02C10_ISP_Y_WIN_CONTROL,

			  ctrl->val ? 2 : 1, &ret);

		cci_update_bits(ov02c10->regmap, OV02C10_ROTATE_CONTROL,

				BIT(4), ov02c10->vflip->val << 4, &ret);

		break;
@@ -551,13 +551,9 @@ static int ov02c10_init_controls(struct ov02c10 *ov02c10) 


	ov02c10->hflip = v4l2_ctrl_new_std(ctrl_hdlr, &ov02c10_ctrl_ops,

					   V4L2_CID_HFLIP, 0, 1, 1, 0);

	if (ov02c10->hflip)

		ov02c10->hflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;



	ov02c10->vflip = v4l2_ctrl_new_std(ctrl_hdlr, &ov02c10_ctrl_ops,

					   V4L2_CID_VFLIP, 0, 1, 1, 0);

	if (ov02c10->vflip)

		ov02c10->vflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;



	v4l2_ctrl_new_std_menu_items(ctrl_hdlr, &ov02c10_ctrl_ops,

				     V4L2_CID_TEST_PATTERN,