media: qcom: camss: Move vfe_disable into a common routine where applicable

We can move vfe_disable() into a common routine in the core VFE file
provided we make wm_stop() a VFE specific callback.

The callback is required to capture the case where VFE 17x currently isn't
VC enabled where as VFE 480 is.

Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c
index a5aa799501861d06c27d229ca6766e65bc42b0c3..0b211fed127605a91482fdf0f7a3013ff91aeb01 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe-170.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c
@@ -494,22 +494,6 @@ static int vfe_enable_output(struct vfe_line *line)
        return 0;
 }
 
-static void vfe_disable_output(struct vfe_line *line)
-{
-       struct vfe_device *vfe = to_vfe(line);
-       struct vfe_output *output = &line->output;
-       unsigned long flags;
-       unsigned int i;
-
-       spin_lock_irqsave(&vfe->output_lock, flags);
-       for (i = 0; i < output->wm_num; i++)
-               vfe_wm_stop(vfe, output->wm_idx[i]);
-       output->gen2.active_num = 0;
-       spin_unlock_irqrestore(&vfe->output_lock, flags);
-
-       vfe_reset(vfe);
-}
-
 /*
  * vfe_enable - Enable streaming on VFE line
  * @line: VFE line
@@ -555,29 +539,6 @@ error_get_output:
        return ret;
 }
 
-/*
- * vfe_disable - Disable streaming on VFE line
- * @line: VFE line
- *
- * Return 0 on success or a negative error code otherwise
- */
-static int vfe_disable(struct vfe_line *line)
-{
-       struct vfe_device *vfe = to_vfe(line);
-
-       vfe_disable_output(line);
-
-       vfe_put_output(line);
-
-       mutex_lock(&vfe->stream_lock);
-
-       vfe->stream_count--;
-
-       mutex_unlock(&vfe->stream_lock);
-
-       return 0;
-}
-
 /*
  * vfe_isr_sof - Process start of frame interrupt
  * @vfe: VFE Device
@@ -770,4 +731,5 @@ const struct vfe_hw_ops vfe_ops_170 = {
        .vfe_enable = vfe_enable,
        .vfe_halt = vfe_halt,
        .violation_read = vfe_violation_read,
+       .vfe_wm_stop = vfe_wm_stop,
 };

diff --git a/drivers/media/platform/qcom/camss/camss-vfe-480.c b/drivers/media/platform/qcom/camss/camss-vfe-480.c
index 43a2964121f22dde4d4ed8c27530b6de6edd623a..f2368b77fc6d6a0029b68483f8d17f9706666240 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe-480.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-480.c
@@ -327,22 +327,6 @@ static int vfe_enable_output(struct vfe_line *line)
        return 0;
 }
 
-static void vfe_disable_output(struct vfe_line *line)
-{
-       struct vfe_device *vfe = to_vfe(line);
-       struct vfe_output *output = &line->output;
-       unsigned long flags;
-       unsigned int i;
-
-       spin_lock_irqsave(&vfe->output_lock, flags);
-       for (i = 0; i < output->wm_num; i++)
-               vfe_wm_stop(vfe, output->wm_idx[i]);
-       output->gen2.active_num = 0;
-       spin_unlock_irqrestore(&vfe->output_lock, flags);
-
-       vfe_reset(vfe);
-}
-
 /*
  * vfe_enable - Enable streaming on VFE line
  * @line: VFE line
@@ -390,29 +374,6 @@ error_get_output:
        return ret;
 }
 
-/*
- * vfe_disable - Disable streaming on VFE line
- * @line: VFE line
- *
- * Return 0 on success or a negative error code otherwise
- */
-static int vfe_disable(struct vfe_line *line)
-{
-       struct vfe_device *vfe = to_vfe(line);
-
-       vfe_disable_output(line);
-
-       vfe_put_output(line);
-
-       mutex_lock(&vfe->stream_lock);
-
-       vfe->stream_count--;
-
-       mutex_unlock(&vfe->stream_lock);
-
-       return 0;
-}
-
 /*
  * vfe_isr_reg_update - Process reg update interrupt
  * @vfe: VFE Device
@@ -581,4 +542,5 @@ const struct vfe_hw_ops vfe_ops_480 = {
        .vfe_disable = vfe_disable,
        .vfe_enable = vfe_enable,
        .vfe_halt = vfe_halt,
+       .vfe_wm_stop = vfe_wm_stop,
 };

diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
index 4db0d0a1c6a51639b27bfcb8c1d2a275b524c454..b3d5af7f09690f5116ae8d2310e1aed0a657b303 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe.c
@@ -410,6 +410,45 @@ int vfe_put_output(struct vfe_line *line)
        return 0;
 }
 
+static int vfe_disable_output(struct vfe_line *line)
+{
+       struct vfe_device *vfe = to_vfe(line);
+       struct vfe_output *output = &line->output;
+       unsigned long flags;
+       unsigned int i;
+
+       spin_lock_irqsave(&vfe->output_lock, flags);
+       for (i = 0; i < output->wm_num; i++)
+               vfe->ops->vfe_wm_stop(vfe, output->wm_idx[i]);
+       output->gen2.active_num = 0;
+       spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+       return vfe_reset(vfe);
+}
+
+/*
+ * vfe_disable - Disable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+int vfe_disable(struct vfe_line *line)
+{
+       struct vfe_device *vfe = to_vfe(line);
+
+       vfe_disable_output(line);
+
+       vfe_put_output(line);
+
+       mutex_lock(&vfe->stream_lock);
+
+       vfe->stream_count--;
+
+       mutex_unlock(&vfe->stream_lock);
+
+       return 0;
+}
+
 /**
  * vfe_isr_comp_done() - Process composite image done interrupt
  * @vfe: VFE Device

diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/platform/qcom/camss/camss-vfe.h
index 4783afa73a36538dd2e979819eb7059190a076ad..09baded0dcdd63ef7e56c0bf7b2873d4bcdf2119 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe.h
+++ b/drivers/media/platform/qcom/camss/camss-vfe.h
@@ -114,6 +114,7 @@ struct vfe_hw_ops {
        int (*vfe_enable)(struct vfe_line *line);
        int (*vfe_halt)(struct vfe_device *vfe);
        void (*violation_read)(struct vfe_device *vfe);
+       void (*vfe_wm_stop)(struct vfe_device *vfe, u8 wm);
 };
 
 struct vfe_isr_ops {
@@ -192,6 +193,14 @@ int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id);
  */
 int vfe_reset(struct vfe_device *vfe);
 
+/*
+ * vfe_disable - Disable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+int vfe_disable(struct vfe_line *line);
+
 extern const struct vfe_hw_ops vfe_ops_4_1;
 extern const struct vfe_hw_ops vfe_ops_4_7;
 extern const struct vfe_hw_ops vfe_ops_4_8;