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 01/15] v4l: vsp1: Don't start/stop media pipeline for DRM Date: Thu, 5 Apr 2018 12:18:26 +0300 [thread overview] Message-ID: <20180405091840.30728-2-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20180405091840.30728-1-laurent.pinchart+renesas@ideasonboard.com> The DRM support code manages a pipeline of VSP entities, each backed by a media entity. When starting or stopping the pipeline, it starts and stops the media pipeline through the media API in order to store the pipeline pointer in every entity. The driver doesn't use the pipe pointer in media entities, neither does it rely on the other effects of the media_pipeline_start() and media_pipeline_stop() functions. Furthermore, as the media links for the DRM pipeline are never set up correctly, and as the pipeline can be modified dynamically when enabling or disabling planes, the current implementation is not correct. Remove the incorrect and unneeded code. While at it remove the outdated comment that states that entities are not started when the LIF is setup, as they now are. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> -- Changes since v1: - Remove outdated comment --- drivers/media/platform/vsp1/vsp1_drm.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c index b8fee1834253..a1f2ba044092 100644 --- a/drivers/media/platform/vsp1/vsp1_drm.c +++ b/drivers/media/platform/vsp1/vsp1_drm.c @@ -109,8 +109,6 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, if (ret == -ETIMEDOUT) dev_err(vsp1->dev, "DRM pipeline stop timeout\n"); - media_pipeline_stop(&pipe->output->entity.subdev.entity); - for (i = 0; i < ARRAY_SIZE(pipe->inputs); ++i) { struct vsp1_rwpf *rpf = pipe->inputs[i]; @@ -223,13 +221,7 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, return -EPIPE; } - /* - * Mark the pipeline as streaming and enable the VSP1. This will store - * the pipeline pointer in all entities, which the s_stream handlers - * will need. We don't start the entities themselves right at this point - * as there's no plane configured yet, so we can't start processing - * buffers. - */ + /* Enable the VSP1. */ ret = vsp1_device_get(vsp1); if (ret < 0) return ret; @@ -241,14 +233,6 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, drm_pipe->du_complete = cfg->callback; drm_pipe->du_private = cfg->callback_data; - ret = media_pipeline_start(&pipe->output->entity.subdev.entity, - &pipe->pipe); - if (ret < 0) { - dev_dbg(vsp1->dev, "%s: pipeline start failed\n", __func__); - vsp1_device_put(vsp1); - return ret; - } - /* Disable the display interrupts. */ vsp1_write(vsp1, VI6_DISP_IRQ_STA, 0); vsp1_write(vsp1, VI6_DISP_IRQ_ENB, 0); -- 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 01/15] v4l: vsp1: Don't start/stop media pipeline for DRM Date: Thu, 5 Apr 2018 12:18:26 +0300 [thread overview] Message-ID: <20180405091840.30728-2-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20180405091840.30728-1-laurent.pinchart+renesas@ideasonboard.com> The DRM support code manages a pipeline of VSP entities, each backed by a media entity. When starting or stopping the pipeline, it starts and stops the media pipeline through the media API in order to store the pipeline pointer in every entity. The driver doesn't use the pipe pointer in media entities, neither does it rely on the other effects of the media_pipeline_start() and media_pipeline_stop() functions. Furthermore, as the media links for the DRM pipeline are never set up correctly, and as the pipeline can be modified dynamically when enabling or disabling planes, the current implementation is not correct. Remove the incorrect and unneeded code. While at it remove the outdated comment that states that entities are not started when the LIF is setup, as they now are. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> -- Changes since v1: - Remove outdated comment --- drivers/media/platform/vsp1/vsp1_drm.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c index b8fee1834253..a1f2ba044092 100644 --- a/drivers/media/platform/vsp1/vsp1_drm.c +++ b/drivers/media/platform/vsp1/vsp1_drm.c @@ -109,8 +109,6 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, if (ret == -ETIMEDOUT) dev_err(vsp1->dev, "DRM pipeline stop timeout\n"); - media_pipeline_stop(&pipe->output->entity.subdev.entity); - for (i = 0; i < ARRAY_SIZE(pipe->inputs); ++i) { struct vsp1_rwpf *rpf = pipe->inputs[i]; @@ -223,13 +221,7 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, return -EPIPE; } - /* - * Mark the pipeline as streaming and enable the VSP1. This will store - * the pipeline pointer in all entities, which the s_stream handlers - * will need. We don't start the entities themselves right at this point - * as there's no plane configured yet, so we can't start processing - * buffers. - */ + /* Enable the VSP1. */ ret = vsp1_device_get(vsp1); if (ret < 0) return ret; @@ -241,14 +233,6 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, drm_pipe->du_complete = cfg->callback; drm_pipe->du_private = cfg->callback_data; - ret = media_pipeline_start(&pipe->output->entity.subdev.entity, - &pipe->pipe); - if (ret < 0) { - dev_dbg(vsp1->dev, "%s: pipeline start failed\n", __func__); - vsp1_device_put(vsp1); - return ret; - } - /* Disable the display interrupts. */ vsp1_write(vsp1, VI6_DISP_IRQ_STA, 0); vsp1_write(vsp1, VI6_DISP_IRQ_ENB, 0); -- 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 ` Laurent Pinchart [this message] 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 ` [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 ` [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 ` 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-2-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.