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 v2 07/15] v4l: vsp1: Setup BRU at atomic commit time Date: Thu, 5 Apr 2018 12:18:32 +0300 [thread overview] Message-ID: <20180405091840.30728-8-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20180405091840.30728-1-laurent.pinchart+renesas@ideasonboard.com> To implement fully dynamic plane assignment to pipelines, we need to reassign the BRU and BRS to the DRM pipelines in the atomic commit handler. In preparation for this setup factor out the BRU source pad code and call it both at LIF setup and atomic commit time. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> --- drivers/media/platform/vsp1/vsp1_drm.c | 56 +++++++++++++++++++++++++++++++++- drivers/media/platform/vsp1/vsp1_drm.h | 5 +++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c index 7bf697ba7969..6ad8aa6c8138 100644 --- a/drivers/media/platform/vsp1/vsp1_drm.c +++ b/drivers/media/platform/vsp1/vsp1_drm.c @@ -148,12 +148,51 @@ static int vsp1_du_pipeline_setup_rpf(struct vsp1_device *vsp1, return 0; } +/* Setup the BRU source pad. */ +static int vsp1_du_pipeline_setup_bru(struct vsp1_device *vsp1, + struct vsp1_pipeline *pipe) +{ + struct vsp1_drm_pipeline *drm_pipe = to_vsp1_drm_pipeline(pipe); + struct v4l2_subdev_format format = { + .which = V4L2_SUBDEV_FORMAT_ACTIVE, + }; + int ret; + + /* + * Configure the format on the BRU source and verify that it matches the + * requested format. We don't set the media bus code as it is configured + * on the BRU sink pad 0 and propagated inside the entity, not on the + * source pad. + */ + format.pad = pipe->bru->source_pad; + format.format.width = drm_pipe->width; + format.format.height = drm_pipe->height; + 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), pipe->bru->source_pad); + + if (format.format.width != drm_pipe->width || + format.format.height != drm_pipe->height) { + dev_dbg(vsp1->dev, "%s: format mismatch\n", __func__); + return -EPIPE; + } + + return 0; +} + static unsigned int rpf_zpos(struct vsp1_device *vsp1, struct vsp1_rwpf *rpf) { return vsp1->drm->inputs[rpf->entity.index].zpos; } -/* Setup the input side of the pipeline (RPFs and BRU sink pads). */ +/* 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) { @@ -191,6 +230,18 @@ static int vsp1_du_pipeline_setup_input(struct vsp1_device *vsp1, inputs[j] = rpf; } + /* + * Setup the BRU. This must be done before setting up the RPF input + * pipelines as the BRU sink compose rectangles depend on the BRU source + * format. + */ + ret = vsp1_du_pipeline_setup_bru(vsp1, pipe); + if (ret < 0) { + dev_err(vsp1->dev, "%s: failed to setup %s source\n", __func__, + BRU_NAME(pipe->bru)); + return ret; + } + /* Setup the RPF input pipeline for every enabled input. */ for (i = 0; i < pipe->bru->source_pad; ++i) { struct vsp1_rwpf *rpf = inputs[i]; @@ -355,6 +406,9 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, return 0; } + drm_pipe->width = cfg->width; + drm_pipe->height = cfg->height; + dev_dbg(vsp1->dev, "%s: configuring LIF%u with format %ux%u\n", __func__, pipe_index, cfg->width, cfg->height); diff --git a/drivers/media/platform/vsp1/vsp1_drm.h b/drivers/media/platform/vsp1/vsp1_drm.h index 9aa19325cbe9..c8dd75ba01f6 100644 --- a/drivers/media/platform/vsp1/vsp1_drm.h +++ b/drivers/media/platform/vsp1/vsp1_drm.h @@ -20,12 +20,17 @@ /** * vsp1_drm_pipeline - State for the API exposed to the DRM driver * @pipe: the VSP1 pipeline used for display + * @width: output display width + * @height: output display height * @du_complete: frame completion callback for the DU driver (optional) * @du_private: data to be passed to the du_complete callback */ struct vsp1_drm_pipeline { struct vsp1_pipeline pipe; + unsigned int width; + unsigned int height; + /* Frame synchronisation */ void (*du_complete)(void *, bool); void *du_private; -- 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 v2 07/15] v4l: vsp1: Setup BRU at atomic commit time Date: Thu, 5 Apr 2018 12:18:32 +0300 [thread overview] Message-ID: <20180405091840.30728-8-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20180405091840.30728-1-laurent.pinchart+renesas@ideasonboard.com> To implement fully dynamic plane assignment to pipelines, we need to reassign the BRU and BRS to the DRM pipelines in the atomic commit handler. In preparation for this setup factor out the BRU source pad code and call it both at LIF setup and atomic commit time. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> --- drivers/media/platform/vsp1/vsp1_drm.c | 56 +++++++++++++++++++++++++++++++++- drivers/media/platform/vsp1/vsp1_drm.h | 5 +++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c index 7bf697ba7969..6ad8aa6c8138 100644 --- a/drivers/media/platform/vsp1/vsp1_drm.c +++ b/drivers/media/platform/vsp1/vsp1_drm.c @@ -148,12 +148,51 @@ static int vsp1_du_pipeline_setup_rpf(struct vsp1_device *vsp1, return 0; } +/* Setup the BRU source pad. */ +static int vsp1_du_pipeline_setup_bru(struct vsp1_device *vsp1, + struct vsp1_pipeline *pipe) +{ + struct vsp1_drm_pipeline *drm_pipe = to_vsp1_drm_pipeline(pipe); + struct v4l2_subdev_format format = { + .which = V4L2_SUBDEV_FORMAT_ACTIVE, + }; + int ret; + + /* + * Configure the format on the BRU source and verify that it matches the + * requested format. We don't set the media bus code as it is configured + * on the BRU sink pad 0 and propagated inside the entity, not on the + * source pad. + */ + format.pad = pipe->bru->source_pad; + format.format.width = drm_pipe->width; + format.format.height = drm_pipe->height; + 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), pipe->bru->source_pad); + + if (format.format.width != drm_pipe->width || + format.format.height != drm_pipe->height) { + dev_dbg(vsp1->dev, "%s: format mismatch\n", __func__); + return -EPIPE; + } + + return 0; +} + static unsigned int rpf_zpos(struct vsp1_device *vsp1, struct vsp1_rwpf *rpf) { return vsp1->drm->inputs[rpf->entity.index].zpos; } -/* Setup the input side of the pipeline (RPFs and BRU sink pads). */ +/* 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) { @@ -191,6 +230,18 @@ static int vsp1_du_pipeline_setup_input(struct vsp1_device *vsp1, inputs[j] = rpf; } + /* + * Setup the BRU. This must be done before setting up the RPF input + * pipelines as the BRU sink compose rectangles depend on the BRU source + * format. + */ + ret = vsp1_du_pipeline_setup_bru(vsp1, pipe); + if (ret < 0) { + dev_err(vsp1->dev, "%s: failed to setup %s source\n", __func__, + BRU_NAME(pipe->bru)); + return ret; + } + /* Setup the RPF input pipeline for every enabled input. */ for (i = 0; i < pipe->bru->source_pad; ++i) { struct vsp1_rwpf *rpf = inputs[i]; @@ -355,6 +406,9 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, return 0; } + drm_pipe->width = cfg->width; + drm_pipe->height = cfg->height; + dev_dbg(vsp1->dev, "%s: configuring LIF%u with format %ux%u\n", __func__, pipe_index, cfg->width, cfg->height); diff --git a/drivers/media/platform/vsp1/vsp1_drm.h b/drivers/media/platform/vsp1/vsp1_drm.h index 9aa19325cbe9..c8dd75ba01f6 100644 --- a/drivers/media/platform/vsp1/vsp1_drm.h +++ b/drivers/media/platform/vsp1/vsp1_drm.h @@ -20,12 +20,17 @@ /** * vsp1_drm_pipeline - State for the API exposed to the DRM driver * @pipe: the VSP1 pipeline used for display + * @width: output display width + * @height: output display height * @du_complete: frame completion callback for the DU driver (optional) * @du_private: data to be passed to the du_complete callback */ struct vsp1_drm_pipeline { struct vsp1_pipeline pipe; + unsigned int width; + unsigned int height; + /* Frame synchronisation */ void (*du_complete)(void *, bool); void *du_private; -- 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-04-05 9:18 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-05 9:18 [PATCH v2 00/15] R-Car VSP1: Dynamically assign blend units to display pipelines Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 01/15] v4l: vsp1: Don't start/stop media pipeline for DRM Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 02/15] v4l: vsp1: Remove unused field from vsp1_drm_pipeline structure Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 03/15] v4l: vsp1: Store pipeline pointer in vsp1_entity Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 04/15] v4l: vsp1: Use vsp1_entity.pipe to check if entity belongs to a pipeline Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 05/15] v4l: vsp1: Share duplicated DRM pipeline configuration code Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 06/15] v4l: vsp1: Move DRM atomic commit pipeline setup to separate function Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-06 19:59 ` [PATCH v2.1 " Laurent Pinchart 2018-04-06 19:59 ` Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart [this message] 2018-04-05 9:18 ` [PATCH v2 07/15] v4l: vsp1: Setup BRU at atomic commit time Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 08/15] v4l: vsp1: Replace manual DRM pipeline input setup in vsp1_du_setup_lif Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 09/15] v4l: vsp1: Move DRM pipeline output setup code to a function Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-06 16:16 ` Kieran Bingham 2018-04-06 16:16 ` Kieran Bingham 2018-04-06 20:00 ` [PATCH v2.1 " Laurent Pinchart 2018-04-06 20:00 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 10/15] v4l: vsp1: Turn frame end completion status into a bitfield Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-06 16:16 ` Kieran Bingham 2018-04-06 16:16 ` Kieran Bingham 2018-04-05 9:18 ` [PATCH v2 11/15] v4l: vsp1: Add per-display list internal completion notification support Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-06 16:16 ` Kieran Bingham 2018-04-06 16:16 ` Kieran Bingham 2018-04-05 9:18 ` [PATCH v2 12/15] v4l: vsp1: Generalize detection of entity removal from DRM pipeline Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 13/15] v4l: vsp1: Assign BRU and BRS to pipelines dynamically Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 14/15] v4l: vsp1: Add BRx dynamic assignment debugging messages Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 15/15] v4l: vsp1: Rename BRU to BRx Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart
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=20180405091840.30728-8-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.