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

media: v4l: vsp1: Move DRM pipeline output setup code to a function 



In order to make the vsp1_du_setup_lif() easier to read, and for
symmetry with the DRM pipeline input setup, move the pipeline output
setup code to a separate function.

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 b76b3ce5

drivers/media/platform/vsp1/vsp1_drm.c

+60 −46
Original line number Diff line number Diff line
@@ -276,6 +276,65 @@ static int vsp1_du_pipeline_setup_inputs(struct vsp1_device *vsp1, 
	return 0;

}



/* Setup the output side of the pipeline (WPF and LIF). */

static int vsp1_du_pipeline_setup_output(struct vsp1_device *vsp1,

					 struct vsp1_pipeline *pipe)

{

	struct vsp1_drm_pipeline *drm_pipe = to_vsp1_drm_pipeline(pipe);

	struct v4l2_subdev_format format = { 0, };

	int ret;



	format.which = V4L2_SUBDEV_FORMAT_ACTIVE;

	format.pad = RWPF_PAD_SINK;

	format.format.width = drm_pipe->width;

	format.format.height = drm_pipe->height;

	format.format.code = MEDIA_BUS_FMT_ARGB8888_1X32;

	format.format.field = V4L2_FIELD_NONE;



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

			       &format);

	if (ret < 0)

		return ret;



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

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

		format.format.code, pipe->output->entity.index);



	format.pad = RWPF_PAD_SOURCE;

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

			       &format);

	if (ret < 0)

		return ret;



	dev_dbg(vsp1->dev, "%s: got format %ux%u (%x) on WPF%u source\n",

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

		format.format.code, pipe->output->entity.index);



	format.pad = LIF_PAD_SINK;

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

			       &format);

	if (ret < 0)

		return ret;



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

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

		format.format.code, pipe->lif->index);



	/*

	 * Verify that the format at the output of the pipeline matches the

	 * requested frame size and media bus code.

	 */

	if (format.format.width != drm_pipe->width ||

	    format.format.height != drm_pipe->height ||

	    format.format.code != MEDIA_BUS_FMT_ARGB8888_1X32) {

		dev_dbg(vsp1->dev, "%s: format mismatch on LIF%u\n", __func__,

			pipe->lif->index);

		return -EPIPE;

	}



	return 0;

}



/* Configure all entities in the pipeline. */

static void vsp1_du_pipeline_configure(struct vsp1_pipeline *pipe)

{
@@ -356,7 +415,6 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, 
	struct vsp1_drm_pipeline *drm_pipe;

	struct vsp1_pipeline *pipe;

	struct vsp1_bru *bru;

	struct v4l2_subdev_format format;

	unsigned long flags;

	unsigned int i;

	int ret;
@@ -417,54 +475,10 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, 
	if (ret < 0)

		return ret;



	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->output->entity.subdev, pad, set_fmt, NULL,

			       &format);

	if (ret < 0)

		return ret;



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

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

		format.format.code, pipe->output->entity.index);



	format.pad = RWPF_PAD_SOURCE;

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

			       &format);

	if (ret < 0)

		return ret;



	dev_dbg(vsp1->dev, "%s: got format %ux%u (%x) on WPF%u source\n",

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

		format.format.code, pipe->output->entity.index);



	format.pad = LIF_PAD_SINK;

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

			       &format);

	ret = vsp1_du_pipeline_setup_output(vsp1, pipe);

	if (ret < 0)

		return ret;



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

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

		format.format.code, pipe_index);



	/*

	 * Verify that the format at the output of the pipeline matches the

	 * requested frame size and media bus code.

	 */

	if (format.format.width != cfg->width ||

	    format.format.height != cfg->height ||

	    format.format.code != MEDIA_BUS_FMT_ARGB8888_1X32) {

		dev_dbg(vsp1->dev, "%s: format mismatch\n", __func__);

		return -EPIPE;

	}



	/* Enable the VSP1. */

	ret = vsp1_device_get(vsp1);

	if (ret < 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE