blob: ecbfe6aa534649345b2ddcce0234919ebcd4a429 [file] [log] [blame]
From 6c442a3b398e2de97621b2f2d71a05d60cffe015 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Date: Thu, 22 Feb 2018 17:27:47 -0500
Subject: [PATCH 1174/1795] media: v4l: vsp1: Use vsp1_entity.pipe to check if
entity belongs to a pipeline
The DRM pipeline handling code uses the entity's pipe list head to check
whether the entity is already included in a pipeline. This method is a
bit fragile in the sense that it uses list_empty() on a list_head that
is a list member. Replace it by a simpler check for the entity pipe
pointer.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
(cherry picked from commit d4fedb0b91bc4ea585c029a6e8e0ee3dd4aad741)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/media/platform/vsp1/vsp1_drm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c
index a7ad85ab0b08..e210917fdc3f 100644
--- a/drivers/media/platform/vsp1/vsp1_drm.c
+++ b/drivers/media/platform/vsp1/vsp1_drm.c
@@ -119,9 +119,9 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index,
* Remove the RPF from the pipe and the list of BRU
* inputs.
*/
- WARN_ON(list_empty(&rpf->entity.list_pipe));
+ WARN_ON(!rpf->entity.pipe);
rpf->entity.pipe = NULL;
- list_del_init(&rpf->entity.list_pipe);
+ list_del(&rpf->entity.list_pipe);
pipe->inputs[i] = NULL;
bru->inputs[rpf->bru_input].rpf = NULL;
@@ -537,7 +537,7 @@ void vsp1_du_atomic_flush(struct device *dev, unsigned int pipe_index)
continue;
}
- if (list_empty(&rpf->entity.list_pipe)) {
+ if (!rpf->entity.pipe) {
rpf->entity.pipe = pipe;
list_add_tail(&rpf->entity.list_pipe, &pipe->entities);
}
@@ -566,7 +566,7 @@ void vsp1_du_atomic_flush(struct device *dev, unsigned int pipe_index)
VI6_DPR_NODE_UNUSED);
entity->pipe = NULL;
- list_del_init(&entity->list_pipe);
+ list_del(&entity->list_pipe);
continue;
}
--
2.19.0