Hi Laurent,
Thanks for the updates
On 05/04/18 10:18, Laurent Pinchart wrote:
> 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: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@xxxxxxxxxxxxxxxx>
> --
> Changes since v1:
>
> - Rename vsp1_du_pipeline_setup_input() to
> vsp1_du_pipeline_setup_inputs()
Hrm ... I perhaps would have expected this to happen in
[PATCH 06/15] v4l: vsp1: Move DRM atomic commit pipeline setup to separate function
But I think that's being quite pedantic - so unless you have a need to respin, I
wouldn't worry about it.
--
Kieran
> - Initialize format local variable to 0 in
> vsp1_du_pipeline_setup_output()
> ---
> drivers/media/platform/vsp1/vsp1_drm.c | 114 ++++++++++++++++++---------------
> 1 file changed, 64 insertions(+), 50 deletions(-)
>
> diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c
> index 00ce99bd1605..a7cccc9b05ef 100644
> --- a/drivers/media/platform/vsp1/vsp1_drm.c
> +++ b/drivers/media/platform/vsp1/vsp1_drm.c
> @@ -193,8 +193,8 @@ static unsigned int rpf_zpos(struct vsp1_device *vsp1, struct vsp1_rwpf *rpf)
> }
>
> /* Setup the input side of the pipeline (RPFs and BRU). */
> -static int vsp1_du_pipeline_setup_input(struct vsp1_device *vsp1,
> - struct vsp1_pipeline *pipe)
> +static int vsp1_du_pipeline_setup_inputs(struct vsp1_device *vsp1,
> + struct vsp1_pipeline *pipe)
> {
> struct vsp1_rwpf *inputs[VSP1_MAX_RPF] = { NULL, };
> struct vsp1_bru *bru = to_bru(&pipe->bru->subdev);
> @@ -276,6 +276,65 @@ static int vsp1_du_pipeline_setup_input(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;
> @@ -413,58 +471,14 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index,
> __func__, pipe_index, cfg->width, cfg->height);
>
> /* Setup formats through the pipeline. */
> - ret = vsp1_du_pipeline_setup_input(vsp1, pipe);
> - 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);
> + ret = vsp1_du_pipeline_setup_inputs(vsp1, pipe);
> 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)
> @@ -612,7 +626,7 @@ void vsp1_du_atomic_flush(struct device *dev, unsigned int pipe_index)
> struct vsp1_drm_pipeline *drm_pipe = &vsp1->drm->pipe[pipe_index];
> struct vsp1_pipeline *pipe = &drm_pipe->pipe;
>
> - vsp1_du_pipeline_setup_input(vsp1, pipe);
> + vsp1_du_pipeline_setup_inputs(vsp1, pipe);
> vsp1_du_pipeline_configure(pipe);
> }
> EXPORT_SYMBOL_GPL(vsp1_du_atomic_flush);
>
