From: Cho KyongHo <pullip.cho@samsung.com>
Date: Thu, 23 Apr 2015 05:19:22 +0000 (+0900)
Subject: [COMMON] media: smfc: wait until the current job finishes before suspending
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e03261594775a56c65e53a293eb586ca42a78928;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[COMMON] media: smfc: wait until the current job finishes before suspending

The driver should ensure that the H/W controlled by the driver is in
idle state so that it is safe to enter the low power mode. SMFC driver
waits until the current job is finished and resuming completion of the
current job after resuming from the low power mode.

Change-Id: I4020a596342a4091fa1c64cdada033ca83c0b76e
Signed-off-by: Cho KyongHo <pullip.cho@samsung.com>
---

diff --git a/drivers/media/platform/exynos/smfc/smfc.c b/drivers/media/platform/exynos/smfc/smfc.c
index 70f43f772596..e69179d568e5 100644
--- a/drivers/media/platform/exynos/smfc/smfc.c
+++ b/drivers/media/platform/exynos/smfc/smfc.c
@@ -282,8 +282,14 @@ static irqreturn_t exynos_smfc_irq_handler(int irq, void *priv)
 	enum vb2_buffer_state state = VB2_BUF_STATE_DONE;
 	u32 streamsize = smfc_get_streamsize(smfc);
 	u32 thumb_streamsize = smfc_get_2nd_streamsize(smfc);
+	bool suspending = false;
 
+	BUG_ON(!(smfc->flags & SMFC_DEV_RUNNING));
+
+	spin_lock(&smfc->flag_lock);
+	suspending = !!(smfc->flags & SMFC_DEV_SUSPENDING);
 	smfc->flags &= ~SMFC_DEV_RUNNING;
+	spin_unlock(&smfc->flag_lock);
 
 	if (!smfc_hwstatus_okay(smfc, ctx)) {
 		smfc_dump_registers(smfc);
@@ -313,7 +319,18 @@ static irqreturn_t exynos_smfc_irq_handler(int irq, void *priv)
 		}
 		v4l2_m2m_buf_done(v4l2_m2m_src_buf_remove(ctx->m2mctx), state);
 		v4l2_m2m_buf_done(vb_capture, state);
-		v4l2_m2m_job_finish(smfc->m2mdev, ctx->m2mctx);
+		if (!suspending) {
+			v4l2_m2m_job_finish(smfc->m2mdev, ctx->m2mctx);
+		} else {
+			/*
+			 * smfc_resume() is in charge of calling
+			 * v4l2_m2m_job_finish() on resuming
+			 * from Suspend To RAM
+			 */
+			spin_lock(&smfc->flag_lock);
+			smfc->flags &= ~SMFC_DEV_SUSPENDING;
+			spin_unlock(&smfc->flag_lock);
+		}
 	} else {
 		dev_err(smfc->dev, "Spurious interrupt on H/W JPEG occurred\n");
 	}
@@ -1129,6 +1146,7 @@ static void smfc_configure_secondary_image(struct smfc_ctx *ctx)
 static void smfc_m2m_device_run(void *priv)
 {
 	struct smfc_ctx *ctx = priv;
+	unsigned long flags;
 	int ret;
 
 	ret = in_irq() ? pm_runtime_get(ctx->smfc->dev) :
@@ -1159,7 +1177,9 @@ static void smfc_m2m_device_run(void *priv)
 	smfc_configure_secondary_image(ctx);
 	smfc_hwconfigure_start(ctx);
 
+	spin_lock_irqsave(&ctx->smfc->flag_lock, flags);
 	ctx->smfc->flags |= SMFC_DEV_RUNNING;
+	spin_unlock_irqrestore(&ctx->smfc->flag_lock, flags);
 }
 
 static void smfc_m2m_job_abort(void *priv)
@@ -1373,6 +1393,8 @@ static int exynos_smfc_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, smfc);
 
+	spin_lock_init(&smfc->flag_lock);
+
 	dev_info(&pdev->dev, "Probed H/W Version: %02x.%02x.%04x\n",
 			(smfc->hwver >> 24) & 0xFF, (smfc->hwver >> 16) & 0xFF,
 			smfc->hwver & 0xFFFF);
@@ -1407,11 +1429,38 @@ MODULE_DEVICE_TABLE(of, exynos_smfc_match);
 #ifdef CONFIG_PM_SLEEP
 static int smfc_suspend(struct device *dev)
 {
+	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(smfc_suspend_wq);
+	struct smfc_dev *smfc = dev_get_drvdata(dev);
+	unsigned long flags;
+
+	spin_lock_irqsave(&smfc->flag_lock, flags);
+	if (!!(smfc->flags & SMFC_DEV_RUNNING))
+		smfc->flags |= SMFC_DEV_SUSPENDING;
+	spin_unlock_irqrestore(&smfc->flag_lock, flags);
+
+	/*
+	 * SMFC_DEV_SUSPENDING is cleared by exynos_smfc_irq_handler()
+	 * It is okay to read flags without a lock because the flag is not
+	 * updated during reading the flag.
+	 */
+	wait_event(smfc_suspend_wq, !(smfc->flags & SMFC_DEV_SUSPENDING));
+
+	/*
+	 * It is guaranteed that the Runtime PM is suspended
+	 * and all relavent clocks are disabled.
+	 */
+
 	return 0;
 }
 
 static int smfc_resume(struct device *dev)
 {
+	struct smfc_dev *smfc = dev_get_drvdata(dev);
+	struct smfc_ctx *ctx = v4l2_m2m_get_curr_priv(smfc->m2mdev);
+
+	/* completing the unfinished job and resuming the next pending jobs */
+	if (ctx)
+		v4l2_m2m_job_finish(smfc->m2mdev, ctx->m2mctx);
 	return 0;
 }
 #endif
diff --git a/drivers/media/platform/exynos/smfc/smfc.h b/drivers/media/platform/exynos/smfc/smfc.h
index 5ff118c78d61..c24b5626ae47 100644
--- a/drivers/media/platform/exynos/smfc/smfc.h
+++ b/drivers/media/platform/exynos/smfc/smfc.h
@@ -42,6 +42,7 @@ static inline bool is_jpeg(const struct smfc_image_format *fmt)
 }
 
 #define SMFC_DEV_RUNNING	(1 << 0)
+#define SMFC_DEV_SUSPENDING	(1 << 1)
 
 struct smfc_dev {
 	struct v4l2_device v4l2_dev;
@@ -49,6 +50,7 @@ struct smfc_dev {
 	struct v4l2_m2m_dev *m2mdev;
 	struct device *dev;
 	void __iomem *reg;
+	spinlock_t flag_lock;
 	struct mutex video_device_mutex;
 	int device_id;
 	u32 hwver;