From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: linux-media@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, Kieran Bingham <kieran.bingham@ideasonboard.com> Subject: [PATCH v2 04/15] v4l: vsp1: Use vsp1_entity.pipe to check if entity belongs to a pipeline Date: Thu, 5 Apr 2018 12:18:29 +0300 [thread overview] Message-ID: <20180405091840.30728-5-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20180405091840.30728-1-laurent.pinchart+renesas@ideasonboard.com> 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> --- 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; } -- Regards, Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: linux-media@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, Kieran Bingham <kieran.bingham@ideasonboard.com>, dri-devel@lists.freedesktop.org Subject: [PATCH v2 04/15] v4l: vsp1: Use vsp1_entity.pipe to check if entity belongs to a pipeline Date: Thu, 5 Apr 2018 12:18:29 +0300 [thread overview] Message-ID: <20180405091840.30728-5-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20180405091840.30728-1-laurent.pinchart+renesas@ideasonboard.com> 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> --- 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; } -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-04-05 9:18 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-05 9:18 [PATCH v2 00/15] R-Car VSP1: Dynamically assign blend units to display pipelines Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 01/15] v4l: vsp1: Don't start/stop media pipeline for DRM Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 02/15] v4l: vsp1: Remove unused field from vsp1_drm_pipeline structure Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 03/15] v4l: vsp1: Store pipeline pointer in vsp1_entity Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart [this message] 2018-04-05 9:18 ` [PATCH v2 04/15] v4l: vsp1: Use vsp1_entity.pipe to check if entity belongs to a pipeline Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 05/15] v4l: vsp1: Share duplicated DRM pipeline configuration code Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 06/15] v4l: vsp1: Move DRM atomic commit pipeline setup to separate function Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-06 19:59 ` [PATCH v2.1 " Laurent Pinchart 2018-04-06 19:59 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 07/15] v4l: vsp1: Setup BRU at atomic commit time Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 08/15] v4l: vsp1: Replace manual DRM pipeline input setup in vsp1_du_setup_lif Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 09/15] v4l: vsp1: Move DRM pipeline output setup code to a function Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-06 16:16 ` Kieran Bingham 2018-04-06 16:16 ` Kieran Bingham 2018-04-06 20:00 ` [PATCH v2.1 " Laurent Pinchart 2018-04-06 20:00 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 10/15] v4l: vsp1: Turn frame end completion status into a bitfield Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-06 16:16 ` Kieran Bingham 2018-04-06 16:16 ` Kieran Bingham 2018-04-05 9:18 ` [PATCH v2 11/15] v4l: vsp1: Add per-display list internal completion notification support Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-06 16:16 ` Kieran Bingham 2018-04-06 16:16 ` Kieran Bingham 2018-04-05 9:18 ` [PATCH v2 12/15] v4l: vsp1: Generalize detection of entity removal from DRM pipeline Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 13/15] v4l: vsp1: Assign BRU and BRS to pipelines dynamically Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 14/15] v4l: vsp1: Add BRx dynamic assignment debugging messages Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart 2018-04-05 9:18 ` [PATCH v2 15/15] v4l: vsp1: Rename BRU to BRx Laurent Pinchart 2018-04-05 9:18 ` Laurent Pinchart
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=20180405091840.30728-5-laurent.pinchart+renesas@ideasonboard.com \ --to=laurent.pinchart+renesas@ideasonboard.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=kieran.bingham@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.