media: qcom: camss: Fix VFE-480 vfe_disable_output()

commit 7f24d291350426d40b36dfbe6b3090617cdfd37a upstream.

vfe-480 is copied from vfe-17x and has the same racy idle timeout bug as in
17x.

Fix the vfe_disable_output() logic to no longer be racy and to conform
to the 17x way of quiescing and then resetting the VFE.

Fixes: 4edc8eae715c ("media: camss: Add initial support for VFE hardware version Titan 480")
Cc: stable@vger.kernel.org
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/platform/qcom/camss/camss-vfe-480.c b/drivers/media/platform/qcom/camss/camss-vfe-480.c
index 1295851103931e0e8b30f1ae5cb3f20c429c76f6..ab42600f7a745b197bf623945fdb228c11e50008 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe-480.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-480.c
@@ -8,7 +8,6 @@
  * Copyright (C) 2021 Jonathan Marek
  */
 
-#include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
@@ -311,35 +310,20 @@ static int vfe_enable_output(struct vfe_line *line)
        return 0;
 }
 
-static int vfe_disable_output(struct vfe_line *line)
+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;
-       bool done;
-       int timeout = 0;
-
-       do {
-               spin_lock_irqsave(&vfe->output_lock, flags);
-               done = !output->gen2.active_num;
-               spin_unlock_irqrestore(&vfe->output_lock, flags);
-               usleep_range(10000, 20000);
-
-               if (timeout++ == 100) {
-                       dev_err(vfe->camss->dev, "VFE idle timeout - resetting\n");
-                       vfe_reset(vfe);
-                       output->gen2.active_num = 0;
-                       return 0;
-               }
-       } while (!done);
 
        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);
 
-       return 0;
+       vfe_reset(vfe);
 }
 
 /*