Commit 45cde0aa authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: imx: imx7-mipi-csis: Centralize initialization of pad formats 



Pad formats for the active configuration are manually initialized in
mipi_csis_subdev_init(), while pad formats for the TRY configurations
are initialized by the subdev .init_cfg() operation. This creates a risk
of the two configurations not being synchronized. Fix it by initializing
formats in the .init_cfg() operation only, and calling it from
mipi_csis_subdev_init().

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent d321dd23

drivers/staging/media/imx/imx7-mipi-csis.c

+32 −24
Original line number Diff line number Diff line
@@ -649,36 +649,47 @@ out: 
	return ret;

}



static struct v4l2_mbus_framefmt *

mipi_csis_get_format(struct csi_state *state,

		     struct v4l2_subdev_pad_config *cfg,

		     enum v4l2_subdev_format_whence which,

		     unsigned int pad)

{

	if (which == V4L2_SUBDEV_FORMAT_TRY)

		return v4l2_subdev_get_try_format(&state->mipi_sd, cfg, pad);



	return &state->format_mbus;

}



static int mipi_csis_init_cfg(struct v4l2_subdev *mipi_sd,

			      struct v4l2_subdev_pad_config *cfg)

{

	struct v4l2_mbus_framefmt *mf;

	unsigned int i;

	struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);

	struct v4l2_mbus_framefmt *fmt_sink;

	struct v4l2_mbus_framefmt *fmt_source;

	enum v4l2_subdev_format_whence which;

	int ret;



	for (i = 0; i < CSIS_PADS_NUM; i++) {

		mf = v4l2_subdev_get_try_format(mipi_sd, cfg, i);



		ret = imx_media_init_mbus_fmt(mf, MIPI_CSIS_DEF_PIX_HEIGHT,

					      MIPI_CSIS_DEF_PIX_WIDTH, 0,

	which = cfg ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;

	fmt_sink = mipi_csis_get_format(state, cfg, which, CSIS_PAD_SINK);

	ret = imx_media_init_mbus_fmt(fmt_sink, MIPI_CSIS_DEF_PIX_WIDTH,

				      MIPI_CSIS_DEF_PIX_HEIGHT, 0,

				      V4L2_FIELD_NONE, NULL);

	if (ret < 0)

		return ret;

	}



	/*

	 * When called from mipi_csis_subdev_init() to initialize the active

	 * configuration, cfg is NULL, which indicates there's no source pad

	 * configuration to set.

	 */

	if (!cfg)

		return 0;

}



static struct v4l2_mbus_framefmt *

mipi_csis_get_format(struct csi_state *state,

		     struct v4l2_subdev_pad_config *cfg,

		     enum v4l2_subdev_format_whence which,

		     unsigned int pad)

{

	if (which == V4L2_SUBDEV_FORMAT_TRY)

		return v4l2_subdev_get_try_format(&state->mipi_sd, cfg, pad);

	fmt_source = mipi_csis_get_format(state, cfg, which, CSIS_PAD_SOURCE);

	*fmt_source = *fmt_sink;



	return &state->format_mbus;

	return 0;

}



static int mipi_csis_get_fmt(struct v4l2_subdev *mipi_sd,
@@ -875,10 +886,7 @@ static int mipi_csis_subdev_init(struct v4l2_subdev *mipi_sd, 
	mipi_sd->dev = &pdev->dev;



	state->csis_fmt = &mipi_csis_formats[0];

	state->format_mbus.code = mipi_csis_formats[0].code;

	state->format_mbus.width = MIPI_CSIS_DEF_PIX_WIDTH;

	state->format_mbus.height = MIPI_CSIS_DEF_PIX_HEIGHT;

	state->format_mbus.field = V4L2_FIELD_NONE;

	mipi_csis_init_cfg(mipi_sd, NULL);



	v4l2_set_subdevdata(mipi_sd, &pdev->dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE