media: renesas: vsp1: Split vsp1_du_setup_lif()

The vsp1_du_setup_lif() function is used to configure and enable a
pipeline, as well as disable it, depending on the cfg argument being a
valid pointer or NULL. This creates a confusing API. Improve it by
splitting the function in two, a vsp1_du_enable() function to configure
a pipeline, and a vsp1_du_disable() function to disaple it.

Keep vsp1_du_setup_lif() as an inline wrapper for existing callers in
the DRM subsystem, to simplify merging. The callers will be updated
separately and the old API will then be removed.

Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Link: https://patch.msgid.link/20260511235637.3468558-3-laurent.pinchart+renesas@ideasonboard.com
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_drm.c b/drivers/media/platform/renesas/vsp1/vsp1_drm.c
index 79b85968b061f760fffe25d111b0bf392b327bd6..1f431874064dfab741894f961cdeffaccde02cd8 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_drm.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_drm.c
@@ -629,14 +629,14 @@ int vsp1_du_init(struct device *dev)
 EXPORT_SYMBOL_GPL(vsp1_du_init);
 
 /**
- * vsp1_du_setup_lif - Setup the output part of the VSP pipeline
+ * vsp1_du_enable - Setup and enable a DU pipeline
  * @dev: the VSP device
  * @pipe_index: the DRM pipeline index
  * @cfg: the LIF configuration
  *
  * Configure the output part of VSP DRM pipeline for the given frame @cfg.width
  * and @cfg.height. This sets up formats on the BRx source pad, the WPF sink and
- * source pads, and the LIF sink pad.
+ * source pads, and the LIF sink pad, and then starts the pipeline.
  *
  * The @pipe_index argument selects which DRM pipeline to setup. The number of
  * available pipelines depend on the VSP instance.
@@ -649,14 +649,13 @@ EXPORT_SYMBOL_GPL(vsp1_du_init);
  *
  * Return 0 on success or a negative error code on failure.
  */
-int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index,
-                     const struct vsp1_du_lif_config *cfg)
+int vsp1_du_enable(struct device *dev, unsigned int pipe_index,
+                  const struct vsp1_du_lif_config *cfg)
 {
        struct vsp1_device *vsp1 = dev_get_drvdata(dev);
        struct vsp1_drm_pipeline *drm_pipe;
        struct vsp1_pipeline *pipe;
        unsigned long flags;
-       unsigned int i;
        int ret;
 
        if (pipe_index >= vsp1->info->lif_count)
@@ -665,60 +664,6 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index,
        drm_pipe = &vsp1->drm->pipe[pipe_index];
        pipe = &drm_pipe->pipe;
 
-       if (!cfg) {
-               struct vsp1_brx *brx;
-
-               mutex_lock(&vsp1->drm->lock);
-
-               brx = to_brx(&pipe->brx->subdev);
-
-               /*
-                * NULL configuration means the CRTC is being disabled, stop
-                * the pipeline and turn the light off.
-                */
-               ret = vsp1_pipeline_stop(pipe);
-               if (ret == -ETIMEDOUT)
-                       dev_err(vsp1->dev, "DRM pipeline stop timeout\n");
-
-               for (i = 0; i < ARRAY_SIZE(pipe->inputs); ++i) {
-                       struct vsp1_rwpf *rpf = pipe->inputs[i];
-
-                       if (!rpf)
-                               continue;
-
-                       /*
-                        * Remove the RPF from the pipe and the list of BRx
-                        * inputs.
-                        */
-                       WARN_ON(!rpf->entity.pipe);
-                       rpf->entity.pipe = NULL;
-                       list_del(&rpf->entity.list_pipe);
-                       pipe->inputs[i] = NULL;
-
-                       brx->inputs[rpf->brx_input].rpf = NULL;
-               }
-
-               drm_pipe->du_complete = NULL;
-               pipe->num_inputs = 0;
-
-               dev_dbg(vsp1->dev, "%s: pipe %u: releasing %s\n",
-                       __func__, pipe->lif->index,
-                       BRX_NAME(pipe->brx));
-
-               list_del(&pipe->brx->list_pipe);
-               pipe->brx->pipe = NULL;
-               pipe->brx = NULL;
-
-               mutex_unlock(&vsp1->drm->lock);
-
-               vsp1_dlm_reset(pipe->output->dlm);
-               vsp1_device_put(vsp1);
-
-               dev_dbg(vsp1->dev, "%s: pipeline disabled\n", __func__);
-
-               return 0;
-       }
-
        /* Reset the underrun counter */
        pipe->underrun_count = 0;
 
@@ -741,7 +686,7 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index,
        if (ret < 0)
                goto unlock;
 
-       vsp1_pipeline_dump(pipe, "LIF setup");
+       vsp1_pipeline_dump(pipe, "DU enable");
 
        /* Enable the VSP1. */
        ret = vsp1_device_get(vsp1);
@@ -777,7 +722,80 @@ unlock:
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(vsp1_du_setup_lif);
+EXPORT_SYMBOL_GPL(vsp1_du_enable);
+
+/**
+ * vsp1_du_disable - Disable and stop a DU pipeline
+ * @dev: the VSP device
+ * @pipe_index: the DRM pipeline index
+ *
+ * The @pipe_index argument selects which DRM pipeline to disable. The number
+ * of available pipelines depend on the VSP instance.
+ *
+ * Return 0 on success or a negative error code on failure.
+ */
+int vsp1_du_disable(struct device *dev, unsigned int pipe_index)
+{
+       struct vsp1_device *vsp1 = dev_get_drvdata(dev);
+       struct vsp1_drm_pipeline *drm_pipe;
+       struct vsp1_pipeline *pipe;
+       struct vsp1_brx *brx;
+       unsigned int i;
+       int ret;
+
+       if (pipe_index >= vsp1->info->lif_count)
+               return -EINVAL;
+
+       drm_pipe = &vsp1->drm->pipe[pipe_index];
+       pipe = &drm_pipe->pipe;
+
+       mutex_lock(&vsp1->drm->lock);
+
+       brx = to_brx(&pipe->brx->subdev);
+
+       ret = vsp1_pipeline_stop(pipe);
+       if (ret == -ETIMEDOUT)
+               dev_err(vsp1->dev, "DRM pipeline stop timeout\n");
+
+       for (i = 0; i < ARRAY_SIZE(pipe->inputs); ++i) {
+               struct vsp1_rwpf *rpf = pipe->inputs[i];
+
+               if (!rpf)
+                       continue;
+
+               /*
+                * Remove the RPF from the pipe and the list of BRx
+                * inputs.
+                */
+               WARN_ON(!rpf->entity.pipe);
+               rpf->entity.pipe = NULL;
+               list_del(&rpf->entity.list_pipe);
+               pipe->inputs[i] = NULL;
+
+               brx->inputs[rpf->brx_input].rpf = NULL;
+       }
+
+       drm_pipe->du_complete = NULL;
+       pipe->num_inputs = 0;
+
+       dev_dbg(vsp1->dev, "%s: pipe %u: releasing %s\n",
+               __func__, pipe->lif->index,
+               BRX_NAME(pipe->brx));
+
+       list_del(&pipe->brx->list_pipe);
+       pipe->brx->pipe = NULL;
+       pipe->brx = NULL;
+
+       mutex_unlock(&vsp1->drm->lock);
+
+       vsp1_dlm_reset(pipe->output->dlm);
+       vsp1_device_put(vsp1);
+
+       dev_dbg(vsp1->dev, "%s: pipeline disabled\n", __func__);
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(vsp1_du_disable);
 
 /**
  * vsp1_du_atomic_begin - Prepare for an atomic update

diff --git a/include/media/vsp1.h b/include/media/vsp1.h
index d9b91ff0276186d85c310728ea08bfc44e59c006..d2085cdb7fcbf00a3a4087d90ee27a68e77b1da4 100644 (file)
--- a/include/media/vsp1.h
+++ b/include/media/vsp1.h
@@ -44,8 +44,18 @@ struct vsp1_du_lif_config {
        void *callback_data;
 };
 
-int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index,
-                     const struct vsp1_du_lif_config *cfg);
+int vsp1_du_enable(struct device *dev, unsigned int pipe_index,
+                  const struct vsp1_du_lif_config *cfg);
+int vsp1_du_disable(struct device *dev, unsigned int pipe_index);
+
+static inline int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index,
+                                   const struct vsp1_du_lif_config *cfg)
+{
+       if (cfg)
+               return vsp1_du_enable(dev, pipe_index, cfg);
+       else
+               return vsp1_du_disable(dev, pipe_index);
+}
 
 /**
  * struct vsp1_du_atomic_config - VSP atomic configuration parameters