From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: linux-media@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, Kieran Bingham <kieran.bingham@ideasonboard.com> Subject: [PATCH 09/15] v4l: vsp1: Replace manual DRM pipeline input setup in vsp1_du_setup_lif Date: Mon, 26 Feb 2018 23:45:10 +0200 [thread overview] Message-ID: <20180226214516.11559-10-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20180226214516.11559-1-laurent.pinchart+renesas@ideasonboard.com> The vsp1_du_setup_lif() function setups the DRM pipeline input manually. This duplicates the code from the vsp1_du_pipeline_setup_input() 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_input() 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: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/media/platform/vsp1/vsp1_drm.c | 40 +++++----------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c index 6ad8aa6c8138..00ce99bd1605 100644 --- a/drivers/media/platform/vsp1/vsp1_drm.c +++ b/drivers/media/platform/vsp1/vsp1_drm.c @@ -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. - */ + /* 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; - - 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); - 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; + 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) -- Regards, Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: linux-media@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, Kieran Bingham <kieran.bingham@ideasonboard.com>, dri-devel@lists.freedesktop.org Subject: [PATCH 09/15] v4l: vsp1: Replace manual DRM pipeline input setup in vsp1_du_setup_lif Date: Mon, 26 Feb 2018 23:45:10 +0200 [thread overview] Message-ID: <20180226214516.11559-10-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20180226214516.11559-1-laurent.pinchart+renesas@ideasonboard.com> The vsp1_du_setup_lif() function setups the DRM pipeline input manually. This duplicates the code from the vsp1_du_pipeline_setup_input() 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_input() 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: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/media/platform/vsp1/vsp1_drm.c | 40 +++++----------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c index 6ad8aa6c8138..00ce99bd1605 100644 --- a/drivers/media/platform/vsp1/vsp1_drm.c +++ b/drivers/media/platform/vsp1/vsp1_drm.c @@ -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. - */ + /* 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; - - 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); - 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; + 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) -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-02-26 21:44 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-26 21:45 [PATCH 00/15] R-Car VSP1: Dynamically assign blend units to display pipelines Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-02-26 21:45 ` [PATCH 01/15] v4l: vsp1: Don't start/stop media pipeline for DRM Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-04-04 15:35 ` Kieran Bingham 2018-04-04 15:35 ` Kieran Bingham 2018-02-26 21:45 ` [PATCH 02/15] v4l: vsp1: Remove outdated comment Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-02-27 8:22 ` Sergei Shtylyov 2018-02-27 8:22 ` Sergei Shtylyov 2018-02-27 9:14 ` Laurent Pinchart 2018-02-27 9:14 ` Laurent Pinchart 2018-03-28 12:27 ` Kieran Bingham 2018-03-28 12:27 ` Kieran Bingham 2018-03-28 19:04 ` Kieran Bingham 2018-03-28 19:04 ` Kieran Bingham 2018-03-29 6:51 ` Laurent Pinchart 2018-03-29 6:51 ` Laurent Pinchart 2018-02-26 21:45 ` [PATCH 03/15] v4l: vsp1: Remove unused field from vsp1_drm_pipeline structure Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-03-28 12:31 ` Kieran Bingham 2018-03-28 12:31 ` Kieran Bingham 2018-02-26 21:45 ` [PATCH 04/15] v4l: vsp1: Store pipeline pointer in vsp1_entity Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-03-28 13:46 ` Kieran Bingham 2018-03-28 13:46 ` Kieran Bingham 2018-02-26 21:45 ` [PATCH 05/15] v4l: vsp1: Use vsp1_entity.pipe to check if entity belongs to a pipeline Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-03-28 14:10 ` Kieran Bingham 2018-03-28 14:10 ` Kieran Bingham 2018-03-29 7:00 ` Laurent Pinchart 2018-03-29 7:00 ` Laurent Pinchart 2018-02-26 21:45 ` [PATCH 06/15] v4l: vsp1: Share duplicated DRM pipeline configuration code Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-03-28 14:25 ` Kieran Bingham 2018-03-28 14:25 ` Kieran Bingham 2018-02-26 21:45 ` [PATCH 07/15] v4l: vsp1: Move DRM atomic commit pipeline setup to separate function Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-03-28 14:43 ` Kieran Bingham 2018-03-28 14:43 ` Kieran Bingham 2018-03-29 7:08 ` Laurent Pinchart 2018-03-29 7:08 ` Laurent Pinchart 2018-02-26 21:45 ` [PATCH 08/15] v4l: vsp1: Setup BRU at atomic commit time Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-03-28 19:01 ` Kieran Bingham 2018-03-28 19:01 ` Kieran Bingham 2018-02-26 21:45 ` Laurent Pinchart [this message] 2018-02-26 21:45 ` [PATCH 09/15] v4l: vsp1: Replace manual DRM pipeline input setup in vsp1_du_setup_lif Laurent Pinchart 2018-03-28 15:01 ` Kieran Bingham 2018-03-28 15:01 ` Kieran Bingham 2018-02-26 21:45 ` [PATCH 10/15] v4l: vsp1: Move DRM pipeline output setup code to a function Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-03-29 11:49 ` Kieran Bingham 2018-03-29 11:49 ` Kieran Bingham 2018-04-02 12:35 ` Laurent Pinchart 2018-04-02 12:35 ` Laurent Pinchart 2018-04-04 16:15 ` Kieran Bingham 2018-04-04 16:15 ` Kieran Bingham 2018-04-04 21:05 ` Laurent Pinchart 2018-04-04 21:05 ` Laurent Pinchart 2018-02-26 21:45 ` [PATCH 11/15] v4l: vsp1: Add per-display list completion notification support Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-04-04 16:16 ` Kieran Bingham 2018-04-04 16:16 ` Kieran Bingham 2018-04-04 21:43 ` Laurent Pinchart 2018-04-04 21:43 ` Laurent Pinchart 2018-04-05 8:46 ` Kieran Bingham 2018-04-05 8:46 ` Kieran Bingham 2018-02-26 21:45 ` [PATCH 12/15] v4l: vsp1: Generalize detection of entity removal from DRM pipeline Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-03-29 11:37 ` Kieran Bingham 2018-03-29 11:37 ` Kieran Bingham 2018-04-02 12:57 ` Laurent Pinchart 2018-04-02 12:57 ` Laurent Pinchart 2018-02-26 21:45 ` [PATCH 13/15] v4l: vsp1: Assign BRU and BRS to pipelines dynamically Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-04-04 16:00 ` Kieran Bingham 2018-04-04 16:00 ` Kieran Bingham 2018-04-04 21:57 ` Laurent Pinchart 2018-04-04 21:57 ` Laurent Pinchart 2018-02-26 21:45 ` [PATCH 14/15] v4l: vsp1: Add BRx dynamic assignment debugging messages Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-04-04 16:17 ` Kieran Bingham 2018-04-04 16:17 ` Kieran Bingham 2018-02-26 21:45 ` [PATCH 15/15] v4l: vsp1: Rename BRU to BRx Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-04-04 16:23 ` Kieran Bingham 2018-04-04 16:23 ` Kieran Bingham
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180226214516.11559-10-laurent.pinchart+renesas@ideasonboard.com \ --to=laurent.pinchart+renesas@ideasonboard.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=kieran.bingham@ideasonboard.com \ --cc=linux-media@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.