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

Commit 46c121e0 authored by Steve Longerbeam's avatar Steve Longerbeam Committed by Mauro Carvalho Chehab
Browse files

media: staging/imx: Implement init_cfg subdev pad op 



Implement the init_cfg pad op in all imx-media subdevices. The try
formats are initialized to the current active formats on all pads.

Signed-off-by: default avatarSteve Longerbeam <steve_longerbeam@mentor.com>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 3b4bf692

drivers/staging/media/imx/imx-ic-prp.c

+1 −0
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ static int prp_registered(struct v4l2_subdev *sd) 
}



static const struct v4l2_subdev_pad_ops prp_pad_ops = {

	.init_cfg = imx_media_init_cfg,

	.enum_mbus_code = prp_enum_mbus_code,

	.get_fmt = prp_get_fmt,

	.set_fmt = prp_set_fmt,

drivers/staging/media/imx/imx-ic-prpencvf.c

+1 −0
Original line number Diff line number Diff line
@@ -1253,6 +1253,7 @@ static void prp_unregistered(struct v4l2_subdev *sd) 
}



static const struct v4l2_subdev_pad_ops prp_pad_ops = {

	.init_cfg = imx_media_init_cfg,

	.enum_mbus_code = prp_enum_mbus_code,

	.enum_frame_size = prp_enum_frame_size,

	.get_fmt = prp_get_fmt,

drivers/staging/media/imx/imx-media-csi.c

+1 −0
Original line number Diff line number Diff line
@@ -1714,6 +1714,7 @@ static const struct v4l2_subdev_video_ops csi_video_ops = { 
};



static const struct v4l2_subdev_pad_ops csi_pad_ops = {

	.init_cfg = imx_media_init_cfg,

	.enum_mbus_code = csi_enum_mbus_code,

	.enum_frame_size = csi_enum_frame_size,

	.enum_frame_interval = csi_enum_frame_interval,

drivers/staging/media/imx/imx-media-utils.c

+29 −0
Original line number Diff line number Diff line
@@ -464,6 +464,35 @@ int imx_media_init_mbus_fmt(struct v4l2_mbus_framefmt *mbus, 
}

EXPORT_SYMBOL_GPL(imx_media_init_mbus_fmt);



/*

 * Initializes the TRY format to the ACTIVE format on all pads

 * of a subdev. Can be used as the .init_cfg pad operation.

 */

int imx_media_init_cfg(struct v4l2_subdev *sd,

		       struct v4l2_subdev_pad_config *cfg)

{

	struct v4l2_mbus_framefmt *mf_try;

	struct v4l2_subdev_format format;

	unsigned int pad;

	int ret;



	for (pad = 0; pad < sd->entity.num_pads; pad++) {

		memset(&format, 0, sizeof(format));



		format.pad = pad;

		format.which = V4L2_SUBDEV_FORMAT_ACTIVE;

		ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, &format);

		if (ret)

			continue;



		mf_try = v4l2_subdev_get_try_format(sd, cfg, pad);

		*mf_try = format.format;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(imx_media_init_cfg);



/*

 * Check whether the field and colorimetry parameters in tryfmt are

 * uninitialized, and if so fill them with the values from fmt,

drivers/staging/media/imx/imx-media-vdic.c

+1 −0
Original line number Diff line number Diff line
@@ -909,6 +909,7 @@ static void vdic_unregistered(struct v4l2_subdev *sd) 
}



static const struct v4l2_subdev_pad_ops vdic_pad_ops = {

	.init_cfg = imx_media_init_cfg,

	.enum_mbus_code = vdic_enum_mbus_code,

	.get_fmt = vdic_get_fmt,

	.set_fmt = vdic_set_fmt,