summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorLaurent Pinchart2015-09-10 20:56:29 +0200
committerMauro Carvalho Chehab2016-02-19 12:30:20 +0100
commit3afb193991ccf80edad9b797ec67a35886a2825a (patch)
tree9ecbbd9dbaf71abecaefc4a4abf8b7dd48d9986d /drivers/media/platform
parent[media] v4l: vsp1: Add VSP+DU support (diff)
downloadkernel-qcow2-linux-3afb193991ccf80edad9b797ec67a35886a2825a.tar.gz
kernel-qcow2-linux-3afb193991ccf80edad9b797ec67a35886a2825a.tar.xz
kernel-qcow2-linux-3afb193991ccf80edad9b797ec67a35886a2825a.zip
[media] v4l: vsp1: Disconnect unused RPFs from the DRM pipeline
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/vsp1/vsp1_drm.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c
index ac81ff10c339..a918bb4ab46c 100644
--- a/drivers/media/platform/vsp1/vsp1_drm.c
+++ b/drivers/media/platform/vsp1/vsp1_drm.c
@@ -38,13 +38,17 @@ static int vsp1_drm_pipeline_run(struct vsp1_pipeline *pipe)
struct vsp1_entity *entity;
list_for_each_entry(entity, &pipe->entities, list_pipe) {
- /* Skip unused RPFs. */
+ /* Disconnect unused RPFs from the pipeline. */
if (entity->type == VSP1_ENTITY_RPF) {
struct vsp1_rwpf *rpf =
to_rwpf(&entity->subdev);
- if (!pipe->inputs[rpf->entity.index])
+ if (!pipe->inputs[rpf->entity.index]) {
+ vsp1_write(entity->vsp1,
+ entity->route->reg,
+ VI6_DPR_NODE_UNUSED);
continue;
+ }
}
vsp1_entity_route_setup(entity);