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

media: v4l: vsp1: Replace manual DRM pipeline input setup in vsp1_du_setup_lif 



The vsp1_du_setup_lif() function sets up the DRM pipeline input
manually. This duplicates the code from the
vsp1_du_pipeline_setup_inputs() function. Replace the manual
implementation by a call to the function.

As the pipeline has no enabled input in vsp1_du_setup_lif(), the
vsp1_du_pipeline_setup_inputs() function will not setup any RPF, and
will thus not setup formats on the BRU sink pads. This isn't a problem
as all inputs are disabled, and the BRU sink pads will be reconfigured
from the atomic commit handler when inputs will be enabled.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 7ff667cf

drivers/media/platform/vsp1/vsp1_drm.c

+6 −34
Original line number Diff line number Diff line
@@ -412,47 +412,19 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, 
	dev_dbg(vsp1->dev, "%s: configuring LIF%u with format %ux%u\n",

		__func__, pipe_index, cfg->width, cfg->height);



	/*

	 * Configure the format at the BRU sinks and propagate it through the

	 * pipeline.

	 */

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

	format.which = V4L2_SUBDEV_FORMAT_ACTIVE;



	for (i = 0; i < pipe->bru->source_pad; ++i) {

		format.pad = i;



		format.format.width = cfg->width;

		format.format.height = cfg->height;

		format.format.code = MEDIA_BUS_FMT_ARGB8888_1X32;

		format.format.field = V4L2_FIELD_NONE;



		ret = v4l2_subdev_call(&pipe->bru->subdev, pad,

				       set_fmt, NULL, &format);

	/* Setup formats through the pipeline. */

	ret = vsp1_du_pipeline_setup_inputs(vsp1, pipe);

	if (ret < 0)

		return ret;



		dev_dbg(vsp1->dev, "%s: set format %ux%u (%x) on %s pad %u\n",

			__func__, format.format.width, format.format.height,

			format.format.code, BRU_NAME(pipe->bru), i);

	}



	format.pad = pipe->bru->source_pad;

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

	format.which = V4L2_SUBDEV_FORMAT_ACTIVE;

	format.pad = RWPF_PAD_SINK;

	format.format.width = cfg->width;

	format.format.height = cfg->height;

	format.format.code = MEDIA_BUS_FMT_ARGB8888_1X32;

	format.format.field = V4L2_FIELD_NONE;



	ret = v4l2_subdev_call(&pipe->bru->subdev, pad, set_fmt, NULL,

			       &format);

	if (ret < 0)

		return ret;



	dev_dbg(vsp1->dev, "%s: set format %ux%u (%x) on %s pad %u\n",

		__func__, format.format.width, format.format.height,

		format.format.code, BRU_NAME(pipe->bru), i);



	format.pad = RWPF_PAD_SINK;

	ret = v4l2_subdev_call(&pipe->output->entity.subdev, pad, set_fmt, NULL,

			       &format);

	if (ret < 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE