Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[media] v4l2-subdev: replace v4l2_subdev_fh by v4l2_subdev_pad_config 



If a subdevice pad op is called from a bridge driver, then there is
no v4l2_subdev_fh struct that can be passed to the subdevice. This
made it hard to use such subdevs from a bridge driver.

This patch replaces the v4l2_subdev_fh pointer by a v4l2_subdev_pad_config
pointer in the pad ops. This allows bridge drivers to use the various
try_ pad ops by creating a v4l2_subdev_pad_config struct and passing it
along to the pad op.

The v4l2_subdev_get_try_* macros had to be changed because of this, so
I also took the opportunity to use the full name of the v4l2_subdev_get_try_*
functions in the __V4L2_SUBDEV_MK_GET_TRY macro arguments: if you now do
'git grep v4l2_subdev_get_try_format' you will actually find the header
where it is defined.

One remark regarding the drivers/staging/media/davinci_vpfe patches: the
*_init_formats() functions assumed that fh could be NULL. However, that's
not true for this driver, it's always set. This is almost certainly a copy
and paste from the omap3isp driver. I've updated the code to reflect the
fact that fh is never NULL.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Tested-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 3d945be0

drivers/media/i2c/adv7180.c

+5 −5
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ static void adv7180_exit_controls(struct adv7180_state *state) 
}



static int adv7180_enum_mbus_code(struct v4l2_subdev *sd,

				  struct v4l2_subdev_fh *fh,

				  struct v4l2_subdev_pad_config *cfg,

				  struct v4l2_subdev_mbus_code_enum *code)

{

	if (code->index != 0)
@@ -645,13 +645,13 @@ static int adv7180_set_field_mode(struct adv7180_state *state) 
}



static int adv7180_get_pad_format(struct v4l2_subdev *sd,

				  struct v4l2_subdev_fh *fh,

				  struct v4l2_subdev_pad_config *cfg,

				  struct v4l2_subdev_format *format)

{

	struct adv7180_state *state = to_state(sd);



	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {

		format->format = *v4l2_subdev_get_try_format(fh, 0);

		format->format = *v4l2_subdev_get_try_format(sd, cfg, 0);

	} else {

		adv7180_mbus_fmt(sd, &format->format);

		format->format.field = state->field;
@@ -661,7 +661,7 @@ static int adv7180_get_pad_format(struct v4l2_subdev *sd, 
}



static int adv7180_set_pad_format(struct v4l2_subdev *sd,

				  struct v4l2_subdev_fh *fh,

				  struct v4l2_subdev_pad_config *cfg,

				  struct v4l2_subdev_format *format)

{

	struct adv7180_state *state = to_state(sd);
@@ -686,7 +686,7 @@ static int adv7180_set_pad_format(struct v4l2_subdev *sd, 
			adv7180_set_power(state, true);

		}

	} else {

		framefmt = v4l2_subdev_get_try_format(fh, 0);

		framefmt = v4l2_subdev_get_try_format(sd, cfg, 0);

		*framefmt = format->format;

	}

drivers/media/i2c/adv7511.c

+9 −7
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ static int adv7511_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid) 
}



static int adv7511_enum_mbus_code(struct v4l2_subdev *sd,

				  struct v4l2_subdev_fh *fh,

				  struct v4l2_subdev_pad_config *cfg,

				  struct v4l2_subdev_mbus_code_enum *code)

{

	if (code->pad != 0)
@@ -842,7 +842,8 @@ static void adv7511_fill_format(struct adv7511_state *state, 
	format->field = V4L2_FIELD_NONE;

}



static int adv7511_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,

static int adv7511_get_fmt(struct v4l2_subdev *sd,

			   struct v4l2_subdev_pad_config *cfg,

			   struct v4l2_subdev_format *format)

{

	struct adv7511_state *state = get_adv7511_state(sd);
@@ -855,7 +856,7 @@ static int adv7511_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 
	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {

		struct v4l2_mbus_framefmt *fmt;



		fmt = v4l2_subdev_get_try_format(fh, format->pad);

		fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);

		format->format.code = fmt->code;

		format->format.colorspace = fmt->colorspace;

		format->format.ycbcr_enc = fmt->ycbcr_enc;
@@ -870,7 +871,8 @@ static int adv7511_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 
	return 0;

}



static int adv7511_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,

static int adv7511_set_fmt(struct v4l2_subdev *sd,

			   struct v4l2_subdev_pad_config *cfg,

			   struct v4l2_subdev_format *format)

{

	struct adv7511_state *state = get_adv7511_state(sd);
@@ -905,7 +907,7 @@ static int adv7511_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 
	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {

		struct v4l2_mbus_framefmt *fmt;



		fmt = v4l2_subdev_get_try_format(fh, format->pad);

		fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);

		fmt->code = format->format.code;

		fmt->colorspace = format->format.colorspace;

		fmt->ycbcr_enc = format->format.ycbcr_enc;

drivers/media/i2c/adv7604.c

+7 −5
Original line number Diff line number Diff line
@@ -1734,7 +1734,7 @@ static int adv76xx_s_routing(struct v4l2_subdev *sd, 
}



static int adv76xx_enum_mbus_code(struct v4l2_subdev *sd,

				  struct v4l2_subdev_fh *fh,

				  struct v4l2_subdev_pad_config *cfg,

				  struct v4l2_subdev_mbus_code_enum *code)

{

	struct adv76xx_state *state = to_state(sd);
@@ -1811,7 +1811,8 @@ static void adv76xx_setup_format(struct adv76xx_state *state) 
			state->format->swap_cb_cr ? ADV76XX_OP_SWAP_CB_CR : 0);

}



static int adv76xx_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,

static int adv76xx_get_format(struct v4l2_subdev *sd,

			      struct v4l2_subdev_pad_config *cfg,

			      struct v4l2_subdev_format *format)

{

	struct adv76xx_state *state = to_state(sd);
@@ -1824,7 +1825,7 @@ static int adv76xx_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 
	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {

		struct v4l2_mbus_framefmt *fmt;



		fmt = v4l2_subdev_get_try_format(fh, format->pad);

		fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);

		format->format.code = fmt->code;

	} else {

		format->format.code = state->format->code;
@@ -1833,7 +1834,8 @@ static int adv76xx_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 
	return 0;

}



static int adv76xx_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,

static int adv76xx_set_format(struct v4l2_subdev *sd,

			      struct v4l2_subdev_pad_config *cfg,

			      struct v4l2_subdev_format *format)

{

	struct adv76xx_state *state = to_state(sd);
@@ -1852,7 +1854,7 @@ static int adv76xx_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 
	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {

		struct v4l2_mbus_framefmt *fmt;



		fmt = v4l2_subdev_get_try_format(fh, format->pad);

		fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);

		fmt->code = format->format.code;

	} else {

		state->format = info;

drivers/media/i2c/m5mols/m5mols_core.c

+8 −8
Original line number Diff line number Diff line
@@ -531,17 +531,17 @@ static int __find_resolution(struct v4l2_subdev *sd, 
}



static struct v4l2_mbus_framefmt *__find_format(struct m5mols_info *info,

				struct v4l2_subdev_fh *fh,

				struct v4l2_subdev_pad_config *cfg,

				enum v4l2_subdev_format_whence which,

				enum m5mols_restype type)

{

	if (which == V4L2_SUBDEV_FORMAT_TRY)

		return fh ? v4l2_subdev_get_try_format(fh, 0) : NULL;

		return cfg ? v4l2_subdev_get_try_format(&info->sd, cfg, 0) : NULL;



	return &info->ffmt[type];

}



static int m5mols_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,

static int m5mols_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg,

			  struct v4l2_subdev_format *fmt)

{

	struct m5mols_info *info = to_m5mols(sd);
@@ -550,7 +550,7 @@ static int m5mols_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 


	mutex_lock(&info->lock);



	format = __find_format(info, fh, fmt->which, info->res_type);

	format = __find_format(info, cfg, fmt->which, info->res_type);

	if (format)

		fmt->format = *format;

	else
@@ -560,7 +560,7 @@ static int m5mols_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 
	return ret;

}



static int m5mols_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,

static int m5mols_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg,

			  struct v4l2_subdev_format *fmt)

{

	struct m5mols_info *info = to_m5mols(sd);
@@ -574,7 +574,7 @@ static int m5mols_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 
	if (ret < 0)

		return ret;



	sfmt = __find_format(info, fh, fmt->which, type);

	sfmt = __find_format(info, cfg, fmt->which, type);

	if (!sfmt)

		return 0;
@@ -640,7 +640,7 @@ static int m5mols_set_frame_desc(struct v4l2_subdev *sd, unsigned int pad, 




static int m5mols_enum_mbus_code(struct v4l2_subdev *sd,

				 struct v4l2_subdev_fh *fh,

				 struct v4l2_subdev_pad_config *cfg,

				 struct v4l2_subdev_mbus_code_enum *code)

{

	if (!code || code->index >= SIZE_DEFAULT_FFMT)
@@ -895,7 +895,7 @@ static const struct v4l2_subdev_core_ops m5mols_core_ops = { 
 */

static int m5mols_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)

{

	struct v4l2_mbus_framefmt *format = v4l2_subdev_get_try_format(fh, 0);

	struct v4l2_mbus_framefmt *format = v4l2_subdev_get_try_format(sd, fh->pad, 0);



	*format = m5mols_default_ffmt[0];

	return 0;

drivers/media/i2c/mt9m032.c

+17 −17
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static int mt9m032_setup_pll(struct mt9m032 *sensor) 
 */



static int mt9m032_enum_mbus_code(struct v4l2_subdev *subdev,

				  struct v4l2_subdev_fh *fh,

				  struct v4l2_subdev_pad_config *cfg,

				  struct v4l2_subdev_mbus_code_enum *code)

{

	if (code->index != 0)
@@ -328,7 +328,7 @@ static int mt9m032_enum_mbus_code(struct v4l2_subdev *subdev, 
}



static int mt9m032_enum_frame_size(struct v4l2_subdev *subdev,

				   struct v4l2_subdev_fh *fh,

				   struct v4l2_subdev_pad_config *cfg,

				   struct v4l2_subdev_frame_size_enum *fse)

{

	if (fse->index != 0 || fse->code != MEDIA_BUS_FMT_Y8_1X8)
@@ -345,18 +345,18 @@ static int mt9m032_enum_frame_size(struct v4l2_subdev *subdev, 
/**

 * __mt9m032_get_pad_crop() - get crop rect

 * @sensor: pointer to the sensor struct

 * @fh: file handle for getting the try crop rect from

 * @cfg: v4l2_subdev_pad_config for getting the try crop rect from

 * @which: select try or active crop rect

 *

 * Returns a pointer the current active or fh relative try crop rect

 */

static struct v4l2_rect *

__mt9m032_get_pad_crop(struct mt9m032 *sensor, struct v4l2_subdev_fh *fh,

__mt9m032_get_pad_crop(struct mt9m032 *sensor, struct v4l2_subdev_pad_config *cfg,

		       enum v4l2_subdev_format_whence which)

{

	switch (which) {

	case V4L2_SUBDEV_FORMAT_TRY:

		return v4l2_subdev_get_try_crop(fh, 0);

		return v4l2_subdev_get_try_crop(&sensor->subdev, cfg, 0);

	case V4L2_SUBDEV_FORMAT_ACTIVE:

		return &sensor->crop;

	default:
@@ -367,18 +367,18 @@ __mt9m032_get_pad_crop(struct mt9m032 *sensor, struct v4l2_subdev_fh *fh, 
/**

 * __mt9m032_get_pad_format() - get format

 * @sensor: pointer to the sensor struct

 * @fh: file handle for getting the try format from

 * @cfg: v4l2_subdev_pad_config for getting the try format from

 * @which: select try or active format

 *

 * Returns a pointer the current active or fh relative try format

 */

static struct v4l2_mbus_framefmt *

__mt9m032_get_pad_format(struct mt9m032 *sensor, struct v4l2_subdev_fh *fh,

__mt9m032_get_pad_format(struct mt9m032 *sensor, struct v4l2_subdev_pad_config *cfg,

			 enum v4l2_subdev_format_whence which)

{

	switch (which) {

	case V4L2_SUBDEV_FORMAT_TRY:

		return v4l2_subdev_get_try_format(fh, 0);

		return v4l2_subdev_get_try_format(&sensor->subdev, cfg, 0);

	case V4L2_SUBDEV_FORMAT_ACTIVE:

		return &sensor->format;

	default:
@@ -387,20 +387,20 @@ __mt9m032_get_pad_format(struct mt9m032 *sensor, struct v4l2_subdev_fh *fh, 
}



static int mt9m032_get_pad_format(struct v4l2_subdev *subdev,

				  struct v4l2_subdev_fh *fh,

				  struct v4l2_subdev_pad_config *cfg,

				  struct v4l2_subdev_format *fmt)

{

	struct mt9m032 *sensor = to_mt9m032(subdev);



	mutex_lock(&sensor->lock);

	fmt->format = *__mt9m032_get_pad_format(sensor, fh, fmt->which);

	fmt->format = *__mt9m032_get_pad_format(sensor, cfg, fmt->which);

	mutex_unlock(&sensor->lock);



	return 0;

}



static int mt9m032_set_pad_format(struct v4l2_subdev *subdev,

				  struct v4l2_subdev_fh *fh,

				  struct v4l2_subdev_pad_config *cfg,

				  struct v4l2_subdev_format *fmt)

{

	struct mt9m032 *sensor = to_mt9m032(subdev);
@@ -414,7 +414,7 @@ static int mt9m032_set_pad_format(struct v4l2_subdev *subdev, 
	}



	/* Scaling is not supported, the format is thus fixed. */

	fmt->format = *__mt9m032_get_pad_format(sensor, fh, fmt->which);

	fmt->format = *__mt9m032_get_pad_format(sensor, cfg, fmt->which);

	ret = 0;



done:
@@ -423,7 +423,7 @@ static int mt9m032_set_pad_format(struct v4l2_subdev *subdev, 
}



static int mt9m032_get_pad_selection(struct v4l2_subdev *subdev,

				     struct v4l2_subdev_fh *fh,

				     struct v4l2_subdev_pad_config *cfg,

				     struct v4l2_subdev_selection *sel)

{

	struct mt9m032 *sensor = to_mt9m032(subdev);
@@ -432,14 +432,14 @@ static int mt9m032_get_pad_selection(struct v4l2_subdev *subdev, 
		return -EINVAL;



	mutex_lock(&sensor->lock);

	sel->r = *__mt9m032_get_pad_crop(sensor, fh, sel->which);

	sel->r = *__mt9m032_get_pad_crop(sensor, cfg, sel->which);

	mutex_unlock(&sensor->lock);



	return 0;

}



static int mt9m032_set_pad_selection(struct v4l2_subdev *subdev,

				     struct v4l2_subdev_fh *fh,

				     struct v4l2_subdev_pad_config *cfg,

				     struct v4l2_subdev_selection *sel)

{

	struct mt9m032 *sensor = to_mt9m032(subdev);
@@ -475,13 +475,13 @@ static int mt9m032_set_pad_selection(struct v4l2_subdev *subdev, 
	rect.height = min_t(unsigned int, rect.height,

			    MT9M032_PIXEL_ARRAY_HEIGHT - rect.top);



	__crop = __mt9m032_get_pad_crop(sensor, fh, sel->which);

	__crop = __mt9m032_get_pad_crop(sensor, cfg, sel->which);



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

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

		 * been modified.

		 */

		format = __mt9m032_get_pad_format(sensor, fh, sel->which);

		format = __mt9m032_get_pad_format(sensor, cfg, sel->which);

		format->width = rect.width;

		format->height = rect.height;

	}