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

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

[media] v4l2-subdev: add support for the new enum_frame_size 'which' field 



Support the new 'which' field in the enum_frame_size ops. Most drivers do not
need to be changed since they always returns the same enumeration regardless
of the 'which' field.

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 avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 3f1ccf16

drivers/media/i2c/s5c73m3/s5c73m3-core.c

+19 −4
Original line number Diff line number Diff line
@@ -1251,6 +1251,7 @@ static int s5c73m3_oif_enum_frame_size(struct v4l2_subdev *sd, 
				   struct v4l2_subdev_pad_config *cfg,

				   struct v4l2_subdev_frame_size_enum *fse)

{

	struct s5c73m3 *state = oif_sd_to_s5c73m3(sd);

	int idx;



	if (fse->pad == OIF_SOURCE_PAD) {
@@ -1260,11 +1261,25 @@ static int s5c73m3_oif_enum_frame_size(struct v4l2_subdev *sd, 
		switch (fse->code) {

		case S5C73M3_JPEG_FMT:

		case S5C73M3_ISP_FMT: {

			struct v4l2_mbus_framefmt *mf =

				v4l2_subdev_get_try_format(sd, cfg, OIF_ISP_PAD);

			unsigned w, h;



			if (fse->which == V4L2_SUBDEV_FORMAT_TRY) {

				struct v4l2_mbus_framefmt *mf;



			fse->max_width = fse->min_width = mf->width;

			fse->max_height = fse->min_height = mf->height;

				mf = v4l2_subdev_get_try_format(sd, cfg,

								OIF_ISP_PAD);



				w = mf->width;

				h = mf->height;

			} else {

				const struct s5c73m3_frame_size *fs;



				fs = state->oif_pix_size[RES_ISP];

				w = fs->width;

				h = fs->height;

			}

			fse->max_width = fse->min_width = w;

			fse->max_height = fse->min_height = h;

			return 0;

		}

		default:

drivers/media/platform/am437x/am437x-vpfe.c

+1 −0
Original line number Diff line number Diff line
@@ -1645,6 +1645,7 @@ static int vpfe_enum_size(struct file *file, void *priv, 
	fse.index = fsize->index;

	fse.pad = 0;

	fse.code = mbus.code;

	fse.which = V4L2_SUBDEV_FORMAT_ACTIVE;

	ret = v4l2_subdev_call(sdinfo->sd, pad, enum_frame_size, NULL, &fse);

	if (ret)

		return -EINVAL;

drivers/media/platform/omap3isp/ispccdc.c

+2 −2
Original line number Diff line number Diff line
@@ -2195,7 +2195,7 @@ static int ccdc_enum_frame_size(struct v4l2_subdev *sd, 
	format.code = fse->code;

	format.width = 1;

	format.height = 1;

	ccdc_try_format(ccdc, cfg, fse->pad, &format, V4L2_SUBDEV_FORMAT_TRY);

	ccdc_try_format(ccdc, cfg, fse->pad, &format, fse->which);

	fse->min_width = format.width;

	fse->min_height = format.height;
@@ -2205,7 +2205,7 @@ static int ccdc_enum_frame_size(struct v4l2_subdev *sd, 
	format.code = fse->code;

	format.width = -1;

	format.height = -1;

	ccdc_try_format(ccdc, cfg, fse->pad, &format, V4L2_SUBDEV_FORMAT_TRY);

	ccdc_try_format(ccdc, cfg, fse->pad, &format, fse->which);

	fse->max_width = format.width;

	fse->max_height = format.height;

drivers/media/platform/omap3isp/ispccp2.c

+2 −2
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ static int ccp2_enum_frame_size(struct v4l2_subdev *sd, 
	format.code = fse->code;

	format.width = 1;

	format.height = 1;

	ccp2_try_format(ccp2, cfg, fse->pad, &format, V4L2_SUBDEV_FORMAT_TRY);

	ccp2_try_format(ccp2, cfg, fse->pad, &format, fse->which);

	fse->min_width = format.width;

	fse->min_height = format.height;
@@ -733,7 +733,7 @@ static int ccp2_enum_frame_size(struct v4l2_subdev *sd, 
	format.code = fse->code;

	format.width = -1;

	format.height = -1;

	ccp2_try_format(ccp2, cfg, fse->pad, &format, V4L2_SUBDEV_FORMAT_TRY);

	ccp2_try_format(ccp2, cfg, fse->pad, &format, fse->which);

	fse->max_width = format.width;

	fse->max_height = format.height;

drivers/media/platform/omap3isp/ispcsi2.c

+2 −2
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ static int csi2_enum_frame_size(struct v4l2_subdev *sd, 
	format.code = fse->code;

	format.width = 1;

	format.height = 1;

	csi2_try_format(csi2, cfg, fse->pad, &format, V4L2_SUBDEV_FORMAT_TRY);

	csi2_try_format(csi2, cfg, fse->pad, &format, fse->which);

	fse->min_width = format.width;

	fse->min_height = format.height;
@@ -954,7 +954,7 @@ static int csi2_enum_frame_size(struct v4l2_subdev *sd, 
	format.code = fse->code;

	format.width = -1;

	format.height = -1;

	csi2_try_format(csi2, cfg, fse->pad, &format, V4L2_SUBDEV_FORMAT_TRY);

	csi2_try_format(csi2, cfg, fse->pad, &format, fse->which);

	fse->max_width = format.width;

	fse->max_height = format.height;