diff options
| author |   Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2017-06-23 16:19:27 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2017-07-29 23:46:56 +0300 |
| commit | 650651b7b5242f168dda1aa8f399edd8f0f1afa6 (patch) | |
| tree | 451bc62463d32250e43769ac122cc64d52991db5 /drivers/media/platform/vsp1/vsp1_drv.c | |
| parent | v4l: vsp1: Store source and sink pointers as vsp1_entity (diff) | |
| download | linux-dev-650651b7b5242f168dda1aa8f399edd8f0f1afa6.tar.xz linux-dev-650651b7b5242f168dda1aa8f399edd8f0f1afa6.zip | |
v4l: vsp1: Don't create links for DRM pipeline
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>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Acked-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/platform/vsp1/vsp1_drv.c')
| -rw-r--r-- | drivers/media/platform/vsp1/vsp1_drv.c | 16 |
1 files changed, 6 insertions, 10 deletions
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; |