Commit aa86ac42 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Hans Verkuil
Browse files

media: i2c: imx219: Access height from active format in imx219_set_ctrl 



Use the active format height instead of the mode height in
imx219_set_ctrl(). This prepares for dropping the mode field from the
imx219 structure.

The state is retrieved using v4l2_subdev_get_locked_active_state() as
the subdev active state and the control handler share the same lock.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarJacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent c59d77be

drivers/media/i2c/imx219.c

+7 −2
Original line number Diff line number Diff line
@@ -397,13 +397,18 @@ static int imx219_set_ctrl(struct v4l2_ctrl *ctrl) 
	struct imx219 *imx219 =

		container_of(ctrl->handler, struct imx219, ctrl_handler);

	struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd);

	const struct v4l2_mbus_framefmt *format;

	struct v4l2_subdev_state *state;

	int ret = 0;



	state = v4l2_subdev_get_locked_active_state(&imx219->sd);

	format = v4l2_subdev_get_pad_format(&imx219->sd, state, 0);



	if (ctrl->id == V4L2_CID_VBLANK) {

		int exposure_max, exposure_def;



		/* Update max exposure while meeting expected vblanking */

		exposure_max = imx219->mode->height + ctrl->val - 4;

		exposure_max = format->height + ctrl->val - 4;

		exposure_def = (exposure_max < IMX219_EXPOSURE_DEFAULT) ?

			exposure_max : IMX219_EXPOSURE_DEFAULT;

		__v4l2_ctrl_modify_range(imx219->exposure,
@@ -443,7 +448,7 @@ static int imx219_set_ctrl(struct v4l2_ctrl *ctrl) 
		break;

	case V4L2_CID_VBLANK:

		cci_write(imx219->regmap, IMX219_REG_VTS,

			  imx219->mode->height + ctrl->val, &ret);

			  format->height + ctrl->val, &ret);

		break;

	case V4L2_CID_TEST_PATTERN_RED:

		cci_write(imx219->regmap, IMX219_REG_TESTP_RED,