From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
To: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>,
dri-devel@lists.freedesktop.org
Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH v2 05/14] v4l: vsp1: Don't create links for DRM pipeline
Date: Thu, 13 Jul 2017 14:06:04 +0100 [thread overview]
Message-ID: <883d6ab4-6f0f-aa2d-b38d-335987a4ca8b@ideasonboard.com> (raw)
In-Reply-To: <20170626181226.29575-6-laurent.pinchart+renesas@ideasonboard.com>
On 26/06/17 19:12, Laurent Pinchart wrote:
> When the VSP1 is used in a DRM pipeline the driver doesn't register the
> media device. Links between entities are not exposed to userspace, but
> are still used internally for the sole purpose of setting up internal
> source to sink pointers through the link setup handler.
>
> Instead of going through this complex procedure, remove link creation
> and set the sink pointers directly.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
A whole function removed ... always love code removal...
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> ---
> drivers/media/platform/vsp1/vsp1_drm.c | 53 ++++------------------------------
> drivers/media/platform/vsp1/vsp1_drm.h | 1 -
> drivers/media/platform/vsp1/vsp1_drv.c | 16 ++++------
> 3 files changed, 12 insertions(+), 58 deletions(-)
>
> diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c
> index 2d5a74e95e09..c72d021ff820 100644
> --- a/drivers/media/platform/vsp1/vsp1_drm.c
> +++ b/drivers/media/platform/vsp1/vsp1_drm.c
> @@ -487,6 +487,7 @@ void vsp1_du_atomic_flush(struct device *dev)
>
> vsp1->bru->inputs[i].rpf = rpf;
> rpf->bru_input = i;
> + rpf->entity.sink = &vsp1->bru->entity;
> rpf->entity.sink_pad = i;
>
> dev_dbg(vsp1->dev, "%s: connecting RPF.%u to BRU:%u\n",
> @@ -564,53 +565,6 @@ EXPORT_SYMBOL_GPL(vsp1_du_unmap_sg);
> * Initialization
> */
>
> -int vsp1_drm_create_links(struct vsp1_device *vsp1)
> -{
> - const u32 flags = MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE;
> - unsigned int i;
> - int ret;
> -
> - /*
> - * VSPD instances require a BRU to perform composition and a LIF to
> - * output to the DU.
> - */
> - if (!vsp1->bru || !vsp1->lif)
> - return -ENXIO;
> -
> - for (i = 0; i < vsp1->info->rpf_count; ++i) {
> - struct vsp1_rwpf *rpf = vsp1->rpf[i];
> -
> - ret = media_create_pad_link(&rpf->entity.subdev.entity,
> - RWPF_PAD_SOURCE,
> - &vsp1->bru->entity.subdev.entity,
> - i, flags);
> - if (ret < 0)
> - return ret;
> -
> - rpf->entity.sink = &vsp1->bru->entity;
> - rpf->entity.sink_pad = i;
> - }
> -
> - ret = media_create_pad_link(&vsp1->bru->entity.subdev.entity,
> - vsp1->bru->entity.source_pad,
> - &vsp1->wpf[0]->entity.subdev.entity,
> - RWPF_PAD_SINK, flags);
> - if (ret < 0)
> - return ret;
> -
> - vsp1->bru->entity.sink = &vsp1->wpf[0]->entity;
> - vsp1->bru->entity.sink_pad = RWPF_PAD_SINK;
> -
> - ret = media_create_pad_link(&vsp1->wpf[0]->entity.subdev.entity,
> - RWPF_PAD_SOURCE,
> - &vsp1->lif->entity.subdev.entity,
> - LIF_PAD_SINK, flags);
> - if (ret < 0)
> - return ret;
> -
> - return 0;
> -}
> -
> int vsp1_drm_init(struct vsp1_device *vsp1)
> {
> struct vsp1_pipeline *pipe;
> @@ -631,6 +585,11 @@ int vsp1_drm_init(struct vsp1_device *vsp1)
> list_add_tail(&input->entity.list_pipe, &pipe->entities);
> }
>
> + vsp1->bru->entity.sink = &vsp1->wpf[0]->entity;
> + vsp1->bru->entity.sink_pad = 0;
> + vsp1->wpf[0]->entity.sink = &vsp1->lif->entity;
> + vsp1->wpf[0]->entity.sink_pad = 0;
> +
> list_add_tail(&vsp1->bru->entity.list_pipe, &pipe->entities);
> list_add_tail(&vsp1->wpf[0]->entity.list_pipe, &pipe->entities);
> list_add_tail(&vsp1->lif->entity.list_pipe, &pipe->entities);
> diff --git a/drivers/media/platform/vsp1/vsp1_drm.h b/drivers/media/platform/vsp1/vsp1_drm.h
> index cbdbb8a39883..67d6549edfad 100644
> --- a/drivers/media/platform/vsp1/vsp1_drm.h
> +++ b/drivers/media/platform/vsp1/vsp1_drm.h
> @@ -48,6 +48,5 @@ static inline struct vsp1_drm *to_vsp1_drm(struct vsp1_pipeline *pipe)
>
> int vsp1_drm_init(struct vsp1_device *vsp1);
> void vsp1_drm_cleanup(struct vsp1_device *vsp1);
> -int vsp1_drm_create_links(struct vsp1_device *vsp1);
>
> #endif /* __VSP1_DRM_H__ */
> diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
> index 9b3a0790f92a..5a467b118a1c 100644
> --- a/drivers/media/platform/vsp1/vsp1_drv.c
> +++ b/drivers/media/platform/vsp1/vsp1_drv.c
> @@ -423,19 +423,15 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
> goto done;
> }
>
> - /* Create links. */
> - if (vsp1->info->uapi)
> - ret = vsp1_uapi_create_links(vsp1);
> - else
> - ret = vsp1_drm_create_links(vsp1);
> - if (ret < 0)
> - goto done;
> -
> /*
> - * Register subdev nodes if the userspace API is enabled or initialize
> - * the DRM pipeline otherwise.
> + * Create links and register subdev nodes if the userspace API is
> + * enabled or initialize the DRM pipeline otherwise.
> */
> if (vsp1->info->uapi) {
> + ret = vsp1_uapi_create_links(vsp1);
> + if (ret < 0)
> + goto done;
> +
> ret = v4l2_device_register_subdev_nodes(&vsp1->v4l2_dev);
> if (ret < 0)
> goto done;
>
next prev parent reply other threads:[~2017-07-13 13:06 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-26 18:12 [PATCH v2 00/14] Renesas R-Car VSP: Add H3 ES2.0 support Laurent Pinchart
2017-06-26 18:12 ` [PATCH v2 01/14] v4l: vsp1: Fill display list headers without holding dlm spinlock Laurent Pinchart
2017-07-13 12:48 ` Kieran Bingham
2017-07-20 13:50 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 02/14] v4l: vsp1: Don't recycle active list at display start Laurent Pinchart
2017-07-13 17:02 ` Kieran Bingham
2017-07-20 13:51 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 03/14] v4l: vsp1: Don't set WPF sink pointer Laurent Pinchart
2017-07-13 12:50 ` Kieran Bingham
2017-07-20 13:52 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 04/14] v4l: vsp1: Store source and sink pointers as vsp1_entity Laurent Pinchart
2017-07-13 13:00 ` Kieran Bingham
2017-07-20 13:53 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 05/14] v4l: vsp1: Don't create links for DRM pipeline Laurent Pinchart
2017-07-13 13:06 ` Kieran Bingham [this message]
2017-07-20 13:54 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 06/14] v4l: vsp1: Add pipe index argument to the VSP-DU API Laurent Pinchart
2017-07-13 13:16 ` Kieran Bingham
2017-07-13 23:04 ` Laurent Pinchart
2017-07-20 13:56 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 07/14] v4l: vsp1: Add support for the BRS entity Laurent Pinchart
2017-07-13 13:38 ` Kieran Bingham
2017-07-20 13:58 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 08/14] v4l: vsp1: Add support for new VSP2-BS, VSP2-DL and VSP2-D instances Laurent Pinchart
2017-07-13 17:49 ` Kieran Bingham
2017-07-13 23:31 ` Laurent Pinchart
2017-07-14 7:36 ` Kieran Bingham
2017-07-14 0:35 ` [PATCH v2.1 " Laurent Pinchart
2017-07-20 13:59 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 09/14] v4l: vsp1: Add support for multiple LIF instances Laurent Pinchart
2017-07-13 17:57 ` Kieran Bingham
2017-07-20 14:00 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 10/14] v4l: vsp1: Add support for multiple DRM pipelines Laurent Pinchart
2017-07-20 14:02 ` Mauro Carvalho Chehab
2017-08-01 18:39 ` Kieran Bingham
2017-06-26 18:12 ` [PATCH v2 11/14] v4l: vsp1: Add support for header display lists in continuous mode Laurent Pinchart
2017-07-20 14:03 ` Mauro Carvalho Chehab
2017-08-01 17:35 ` Kieran Bingham
2017-08-01 18:47 ` Laurent Pinchart
2017-08-02 11:06 ` Kieran Bingham
2017-06-26 18:12 ` [PATCH v2 12/14] drm: rcar-du: Support multiple sources from the same VSP Laurent Pinchart
2017-08-01 18:10 ` Kieran Bingham
2017-08-01 19:01 ` Laurent Pinchart
2017-06-26 18:12 ` [PATCH v2 13/14] drm: rcar-du: Restrict DPLL duty cycle workaround to H3 ES1.x Laurent Pinchart
2017-08-01 14:06 ` Kieran Bingham
2017-08-01 18:39 ` Laurent Pinchart
2017-12-11 20:58 ` Laurent Pinchart
2017-06-26 18:12 ` [PATCH v2 14/14] drm: rcar-du: Configure DPAD0 routing through last group on Gen3 Laurent Pinchart
2017-08-01 13:46 ` Kieran Bingham
2017-08-01 13:51 ` Laurent Pinchart
2017-08-01 17:20 ` [PATCH v2.1 " Laurent Pinchart
2017-08-01 17:23 ` Kieran Bingham
2017-07-13 12:25 ` [PATCH v2 00/14] Renesas R-Car VSP: Add H3 ES2.0 support Kieran Bingham
2017-07-14 0:54 ` Laurent Pinchart
2017-07-18 13:03 ` Hans Verkuil
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=883d6ab4-6f0f-aa2d-b38d-335987a4ca8b@ideasonboard.com \
--to=kieran.bingham+renesas@ideasonboard.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kieran.bingham@ideasonboard.com \
--cc=laurent.pinchart+renesas@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).