OSDN Git Service

v4l: vsp1: Register pipe with output WPF
authorKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Mon, 27 Feb 2017 13:40:34 +0000 (10:40 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 Mar 2018 08:17:50 +0000 (09:17 +0100)
[ Upstream commit 1531a208ed861e4bd287444f9466ffcf98383de2 ]

The DRM object does not register the pipe with the WPF object. This is
used internally throughout the driver as a means of accessing the pipe.
As such this breaks operations which require access to the pipe from WPF
interrupts.

Register the pipe inside the WPF object after it has been declared as
the output.

Fixes: ff7e97c94d9f ("[media] v4l: vsp1: Store pipeline pointer in rwpf")

Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/platform/vsp1/vsp1_drm.c

index cd209dc..8e2aa3f 100644 (file)
@@ -596,6 +596,7 @@ int vsp1_drm_init(struct vsp1_device *vsp1)
        pipe->bru = &vsp1->bru->entity;
        pipe->lif = &vsp1->lif->entity;
        pipe->output = vsp1->wpf[0];
+       pipe->output->pipe = pipe;
 
        return 0;
 }