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 06/15] v4l: vsp1: Share duplicated DRM pipeline configuration code Date: Mon, 26 Feb 2018 23:45:07 +0200 [thread overview] Message-ID: <20180226214516.11559-7-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20180226214516.11559-1-laurent.pinchart+renesas@ideasonboard.com> Move the duplicated DRM pipeline configuration code to a function and call it from vsp1_du_setup_lif() and vsp1_du_atomic_flush(). Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/media/platform/vsp1/vsp1_drm.c | 95 +++++++++++++++------------------- 1 file changed, 43 insertions(+), 52 deletions(-) diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c index e210917fdc3f..9a043a915c0b 100644 --- a/drivers/media/platform/vsp1/vsp1_drm.c +++ b/drivers/media/platform/vsp1/vsp1_drm.c @@ -42,6 +42,47 @@ static void vsp1_du_pipeline_frame_end(struct vsp1_pipeline *pipe, drm_pipe->du_complete(drm_pipe->du_private, completed); } +/* ----------------------------------------------------------------------------- + * Pipeline Configuration + */ + +/* Configure all entities in the pipeline. */ +static void vsp1_du_pipeline_configure(struct vsp1_pipeline *pipe) +{ + struct vsp1_entity *entity; + struct vsp1_entity *next; + struct vsp1_dl_list *dl; + + dl = vsp1_dl_list_get(pipe->output->dlm); + + list_for_each_entry_safe(entity, next, &pipe->entities, list_pipe) { + /* Disconnect unused RPFs from the pipeline. */ + if (entity->type == VSP1_ENTITY_RPF && + !pipe->inputs[entity->index]) { + vsp1_dl_list_write(dl, entity->route->reg, + VI6_DPR_NODE_UNUSED); + + entity->pipe = NULL; + list_del(&entity->list_pipe); + + continue; + } + + vsp1_entity_route_setup(entity, pipe, dl); + + if (entity->ops->configure) { + entity->ops->configure(entity, pipe, dl, + VSP1_ENTITY_PARAMS_INIT); + entity->ops->configure(entity, pipe, dl, + VSP1_ENTITY_PARAMS_RUNTIME); + entity->ops->configure(entity, pipe, dl, + VSP1_ENTITY_PARAMS_PARTITION); + } + } + + vsp1_dl_list_commit(dl); +} + /* ----------------------------------------------------------------------------- * DU Driver API */ @@ -85,9 +126,6 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, struct vsp1_drm_pipeline *drm_pipe; struct vsp1_pipeline *pipe; struct vsp1_bru *bru; - struct vsp1_entity *entity; - struct vsp1_entity *next; - struct vsp1_dl_list *dl; struct v4l2_subdev_format format; unsigned long flags; unsigned int i; @@ -239,22 +277,7 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, vsp1_write(vsp1, VI6_DISP_IRQ_ENB, 0); /* Configure all entities in the pipeline. */ - dl = vsp1_dl_list_get(pipe->output->dlm); - - list_for_each_entry_safe(entity, next, &pipe->entities, list_pipe) { - vsp1_entity_route_setup(entity, pipe, dl); - - if (entity->ops->configure) { - entity->ops->configure(entity, pipe, dl, - VSP1_ENTITY_PARAMS_INIT); - entity->ops->configure(entity, pipe, dl, - VSP1_ENTITY_PARAMS_RUNTIME); - entity->ops->configure(entity, pipe, dl, - VSP1_ENTITY_PARAMS_PARTITION); - } - } - - vsp1_dl_list_commit(dl); + vsp1_du_pipeline_configure(pipe); /* Start the pipeline. */ spin_lock_irqsave(&pipe->irqlock, flags); @@ -490,15 +513,9 @@ void vsp1_du_atomic_flush(struct device *dev, unsigned int pipe_index) struct vsp1_pipeline *pipe = &drm_pipe->pipe; struct vsp1_rwpf *inputs[VSP1_MAX_RPF] = { NULL, }; struct vsp1_bru *bru = to_bru(&pipe->bru->subdev); - struct vsp1_entity *entity; - struct vsp1_entity *next; - struct vsp1_dl_list *dl; unsigned int i; int ret; - /* Prepare the display list. */ - dl = vsp1_dl_list_get(pipe->output->dlm); - /* Count the number of enabled inputs and sort them by Z-order. */ pipe->num_inputs = 0; @@ -557,33 +574,7 @@ void vsp1_du_atomic_flush(struct device *dev, unsigned int pipe_index) __func__, rpf->entity.index); } - /* Configure all entities in the pipeline. */ - list_for_each_entry_safe(entity, next, &pipe->entities, list_pipe) { - /* Disconnect unused RPFs from the pipeline. */ - if (entity->type == VSP1_ENTITY_RPF && - !pipe->inputs[entity->index]) { - vsp1_dl_list_write(dl, entity->route->reg, - VI6_DPR_NODE_UNUSED); - - entity->pipe = NULL; - list_del(&entity->list_pipe); - - continue; - } - - vsp1_entity_route_setup(entity, pipe, dl); - - if (entity->ops->configure) { - entity->ops->configure(entity, pipe, dl, - VSP1_ENTITY_PARAMS_INIT); - entity->ops->configure(entity, pipe, dl, - VSP1_ENTITY_PARAMS_RUNTIME); - entity->ops->configure(entity, pipe, dl, - VSP1_ENTITY_PARAMS_PARTITION); - } - } - - vsp1_dl_list_commit(dl); + vsp1_du_pipeline_configure(pipe); } EXPORT_SYMBOL_GPL(vsp1_du_atomic_flush); -- 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 06/15] v4l: vsp1: Share duplicated DRM pipeline configuration code Date: Mon, 26 Feb 2018 23:45:07 +0200 [thread overview] Message-ID: <20180226214516.11559-7-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20180226214516.11559-1-laurent.pinchart+renesas@ideasonboard.com> Move the duplicated DRM pipeline configuration code to a function and call it from vsp1_du_setup_lif() and vsp1_du_atomic_flush(). Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/media/platform/vsp1/vsp1_drm.c | 95 +++++++++++++++------------------- 1 file changed, 43 insertions(+), 52 deletions(-) diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c index e210917fdc3f..9a043a915c0b 100644 --- a/drivers/media/platform/vsp1/vsp1_drm.c +++ b/drivers/media/platform/vsp1/vsp1_drm.c @@ -42,6 +42,47 @@ static void vsp1_du_pipeline_frame_end(struct vsp1_pipeline *pipe, drm_pipe->du_complete(drm_pipe->du_private, completed); } +/* ----------------------------------------------------------------------------- + * Pipeline Configuration + */ + +/* Configure all entities in the pipeline. */ +static void vsp1_du_pipeline_configure(struct vsp1_pipeline *pipe) +{ + struct vsp1_entity *entity; + struct vsp1_entity *next; + struct vsp1_dl_list *dl; + + dl = vsp1_dl_list_get(pipe->output->dlm); + + list_for_each_entry_safe(entity, next, &pipe->entities, list_pipe) { + /* Disconnect unused RPFs from the pipeline. */ + if (entity->type == VSP1_ENTITY_RPF && + !pipe->inputs[entity->index]) { + vsp1_dl_list_write(dl, entity->route->reg, + VI6_DPR_NODE_UNUSED); + + entity->pipe = NULL; + list_del(&entity->list_pipe); + + continue; + } + + vsp1_entity_route_setup(entity, pipe, dl); + + if (entity->ops->configure) { + entity->ops->configure(entity, pipe, dl, + VSP1_ENTITY_PARAMS_INIT); + entity->ops->configure(entity, pipe, dl, + VSP1_ENTITY_PARAMS_RUNTIME); + entity->ops->configure(entity, pipe, dl, + VSP1_ENTITY_PARAMS_PARTITION); + } + } + + vsp1_dl_list_commit(dl); +} + /* ----------------------------------------------------------------------------- * DU Driver API */ @@ -85,9 +126,6 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, struct vsp1_drm_pipeline *drm_pipe; struct vsp1_pipeline *pipe; struct vsp1_bru *bru; - struct vsp1_entity *entity; - struct vsp1_entity *next; - struct vsp1_dl_list *dl; struct v4l2_subdev_format format; unsigned long flags; unsigned int i; @@ -239,22 +277,7 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, vsp1_write(vsp1, VI6_DISP_IRQ_ENB, 0); /* Configure all entities in the pipeline. */ - dl = vsp1_dl_list_get(pipe->output->dlm); - - list_for_each_entry_safe(entity, next, &pipe->entities, list_pipe) { - vsp1_entity_route_setup(entity, pipe, dl); - - if (entity->ops->configure) { - entity->ops->configure(entity, pipe, dl, - VSP1_ENTITY_PARAMS_INIT); - entity->ops->configure(entity, pipe, dl, - VSP1_ENTITY_PARAMS_RUNTIME); - entity->ops->configure(entity, pipe, dl, - VSP1_ENTITY_PARAMS_PARTITION); - } - } - - vsp1_dl_list_commit(dl); + vsp1_du_pipeline_configure(pipe); /* Start the pipeline. */ spin_lock_irqsave(&pipe->irqlock, flags); @@ -490,15 +513,9 @@ void vsp1_du_atomic_flush(struct device *dev, unsigned int pipe_index) struct vsp1_pipeline *pipe = &drm_pipe->pipe; struct vsp1_rwpf *inputs[VSP1_MAX_RPF] = { NULL, }; struct vsp1_bru *bru = to_bru(&pipe->bru->subdev); - struct vsp1_entity *entity; - struct vsp1_entity *next; - struct vsp1_dl_list *dl; unsigned int i; int ret; - /* Prepare the display list. */ - dl = vsp1_dl_list_get(pipe->output->dlm); - /* Count the number of enabled inputs and sort them by Z-order. */ pipe->num_inputs = 0; @@ -557,33 +574,7 @@ void vsp1_du_atomic_flush(struct device *dev, unsigned int pipe_index) __func__, rpf->entity.index); } - /* Configure all entities in the pipeline. */ - list_for_each_entry_safe(entity, next, &pipe->entities, list_pipe) { - /* Disconnect unused RPFs from the pipeline. */ - if (entity->type == VSP1_ENTITY_RPF && - !pipe->inputs[entity->index]) { - vsp1_dl_list_write(dl, entity->route->reg, - VI6_DPR_NODE_UNUSED); - - entity->pipe = NULL; - list_del(&entity->list_pipe); - - continue; - } - - vsp1_entity_route_setup(entity, pipe, dl); - - if (entity->ops->configure) { - entity->ops->configure(entity, pipe, dl, - VSP1_ENTITY_PARAMS_INIT); - entity->ops->configure(entity, pipe, dl, - VSP1_ENTITY_PARAMS_RUNTIME); - entity->ops->configure(entity, pipe, dl, - VSP1_ENTITY_PARAMS_PARTITION); - } - } - - vsp1_dl_list_commit(dl); + vsp1_du_pipeline_configure(pipe); } EXPORT_SYMBOL_GPL(vsp1_du_atomic_flush); -- 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-02-26 21:44 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-26 21:45 [PATCH 00/15] R-Car VSP1: Dynamically assign blend units to display pipelines Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-02-26 21:45 ` [PATCH 01/15] v4l: vsp1: Don't start/stop media pipeline for DRM Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-04-04 15:35 ` Kieran Bingham 2018-04-04 15:35 ` Kieran Bingham 2018-02-26 21:45 ` [PATCH 02/15] v4l: vsp1: Remove outdated comment Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-02-27 8:22 ` Sergei Shtylyov 2018-02-27 8:22 ` Sergei Shtylyov 2018-02-27 9:14 ` Laurent Pinchart 2018-02-27 9:14 ` Laurent Pinchart 2018-03-28 12:27 ` Kieran Bingham 2018-03-28 12:27 ` Kieran Bingham 2018-03-28 19:04 ` Kieran Bingham 2018-03-28 19:04 ` Kieran Bingham 2018-03-29 6:51 ` Laurent Pinchart 2018-03-29 6:51 ` Laurent Pinchart 2018-02-26 21:45 ` [PATCH 03/15] v4l: vsp1: Remove unused field from vsp1_drm_pipeline structure Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-03-28 12:31 ` Kieran Bingham 2018-03-28 12:31 ` Kieran Bingham 2018-02-26 21:45 ` [PATCH 04/15] v4l: vsp1: Store pipeline pointer in vsp1_entity Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-03-28 13:46 ` Kieran Bingham 2018-03-28 13:46 ` Kieran Bingham 2018-02-26 21:45 ` [PATCH 05/15] v4l: vsp1: Use vsp1_entity.pipe to check if entity belongs to a pipeline Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-03-28 14:10 ` Kieran Bingham 2018-03-28 14:10 ` Kieran Bingham 2018-03-29 7:00 ` Laurent Pinchart 2018-03-29 7:00 ` Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart [this message] 2018-02-26 21:45 ` [PATCH 06/15] v4l: vsp1: Share duplicated DRM pipeline configuration code Laurent Pinchart 2018-03-28 14:25 ` Kieran Bingham 2018-03-28 14:25 ` Kieran Bingham 2018-02-26 21:45 ` [PATCH 07/15] v4l: vsp1: Move DRM atomic commit pipeline setup to separate function Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-03-28 14:43 ` Kieran Bingham 2018-03-28 14:43 ` Kieran Bingham 2018-03-29 7:08 ` Laurent Pinchart 2018-03-29 7:08 ` Laurent Pinchart 2018-02-26 21:45 ` [PATCH 08/15] v4l: vsp1: Setup BRU at atomic commit time Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-03-28 19:01 ` Kieran Bingham 2018-03-28 19:01 ` Kieran Bingham 2018-02-26 21:45 ` [PATCH 09/15] v4l: vsp1: Replace manual DRM pipeline input setup in vsp1_du_setup_lif Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-03-28 15:01 ` Kieran Bingham 2018-03-28 15:01 ` Kieran Bingham 2018-02-26 21:45 ` [PATCH 10/15] v4l: vsp1: Move DRM pipeline output setup code to a function Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-03-29 11:49 ` Kieran Bingham 2018-03-29 11:49 ` Kieran Bingham 2018-04-02 12:35 ` Laurent Pinchart 2018-04-02 12:35 ` Laurent Pinchart 2018-04-04 16:15 ` Kieran Bingham 2018-04-04 16:15 ` Kieran Bingham 2018-04-04 21:05 ` Laurent Pinchart 2018-04-04 21:05 ` Laurent Pinchart 2018-02-26 21:45 ` [PATCH 11/15] v4l: vsp1: Add per-display list completion notification support Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-04-04 16:16 ` Kieran Bingham 2018-04-04 16:16 ` Kieran Bingham 2018-04-04 21:43 ` Laurent Pinchart 2018-04-04 21:43 ` Laurent Pinchart 2018-04-05 8:46 ` Kieran Bingham 2018-04-05 8:46 ` Kieran Bingham 2018-02-26 21:45 ` [PATCH 12/15] v4l: vsp1: Generalize detection of entity removal from DRM pipeline Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-03-29 11:37 ` Kieran Bingham 2018-03-29 11:37 ` Kieran Bingham 2018-04-02 12:57 ` Laurent Pinchart 2018-04-02 12:57 ` Laurent Pinchart 2018-02-26 21:45 ` [PATCH 13/15] v4l: vsp1: Assign BRU and BRS to pipelines dynamically Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-04-04 16:00 ` Kieran Bingham 2018-04-04 16:00 ` Kieran Bingham 2018-04-04 21:57 ` Laurent Pinchart 2018-04-04 21:57 ` Laurent Pinchart 2018-02-26 21:45 ` [PATCH 14/15] v4l: vsp1: Add BRx dynamic assignment debugging messages Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-04-04 16:17 ` Kieran Bingham 2018-04-04 16:17 ` Kieran Bingham 2018-02-26 21:45 ` [PATCH 15/15] v4l: vsp1: Rename BRU to BRx Laurent Pinchart 2018-02-26 21:45 ` Laurent Pinchart 2018-04-04 16:23 ` Kieran Bingham 2018-04-04 16:23 ` Kieran Bingham
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=20180226214516.11559-7-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.