Re: [PATCH] Fix suspend/resume of pxa_camera driver

[Robert Jarzmik <robert.jarzmik@free.fr>]

> So, to sum up :
>  - I finish the mt9m111 driver
>  - I submit it
>  - I cook up a clean suspend/resume (unless you did it first of course :)

All right, I finished the pxa_camera part. The suspend/resume does work with a
opened video stream. The capture begins before the suspend and finished after
the resume.

I post the patch here attached for information. I'll submit later with the
complete suspend/resume serie. This is just for preliminary comments. Of course,
this patch superseeds the origin patch posted in this thread, which didn't work
for an opened video stream.

--
Robert

>From fb38f10c233a5b4e13f5ad42cf1c381ecc4215e9 Mon Sep 17 00:00:00 2001
From: Robert Jarzmik <robert.jarzmik@free.fr>
Date: Sun, 27 Jul 2008 00:52:22 +0200
Subject: [PATCH] Fix suspend/resume of pxa_camera driver

PXA suspend switches off DMA core, which looses all context
of previously assigned descriptors. As pxa_camera driver
relies on DMA transfers, setup the lost descriptors on
resume and retrigger frame acquisition if needed.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
 drivers/media/video/pxa_camera.c |   49 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 49 insertions(+), 0 deletions(-)

diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index efb2d19..f00844c 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -128,6 +128,8 @@ struct pxa_camera_dev {
 
 	struct pxa_buffer	*active;
 	struct pxa_dma_desc	*sg_tail[3];
+
+	u32			save_CICR[5];
 };
 
 static const char *pxa_cam_driver_description = "PXA_Camera";
@@ -1017,6 +1019,51 @@ static struct soc_camera_host pxa_soc_camera_host = {
 	.ops			= &pxa_soc_camera_host_ops,
 };
 
+static int pxa_camera_suspend(struct platform_device *pdev, pm_message_t state)
+{
+	struct pxa_camera_dev *pcdev = platform_get_drvdata(pdev);
+	int i = 0;
+
+	pcdev->save_CICR[i++] = CICR0;
+	pcdev->save_CICR[i++] = CICR1;
+	pcdev->save_CICR[i++] = CICR2;
+	pcdev->save_CICR[i++] = CICR3;
+	pcdev->save_CICR[i++] = CICR4;
+
+	return 0;
+}
+
+static int pxa_camera_resume(struct platform_device *pdev)
+{
+	struct pxa_camera_dev *pcdev = platform_get_drvdata(pdev);
+	int i = 0;
+
+	DRCMR68 = pcdev->dma_chans[0] | DRCMR_MAPVLD;
+	DRCMR69 = pcdev->dma_chans[1] | DRCMR_MAPVLD;
+	DRCMR70 = pcdev->dma_chans[2] | DRCMR_MAPVLD;
+
+	CICR0 = pcdev->save_CICR[i++] & ~CICR0_ENB;
+	CICR1 = pcdev->save_CICR[i++];
+	CICR2 = pcdev->save_CICR[i++];
+	CICR3 = pcdev->save_CICR[i++];
+	CICR4 = pcdev->save_CICR[i++];
+
+	if ((pcdev->icd) && (pcdev->icd->ops->resume))
+		pcdev->icd->ops->resume(pcdev->icd);
+
+	/* Restart frame capture if active buffer exists */
+	if (pcdev->active) {
+		/* Reset the FIFOs */
+		CIFR |= CIFR_RESET_F;
+		/* Enable End-Of-Frame Interrupt */
+		CICR0 &= ~CICR0_EOFM;
+		/* Restart the Capture Interface */
+		CICR0 |= CICR0_ENB;
+	}
+
+	return 0;
+}
+
 static int pxa_camera_probe(struct platform_device *pdev)
 {
 	struct pxa_camera_dev *pcdev;
@@ -1188,6 +1235,8 @@ static struct platform_driver pxa_camera_driver = {
 	},
 	.probe		= pxa_camera_probe,
 	.remove		= __exit_p(pxa_camera_remove),
+	.suspend	= pxa_camera_suspend,
+	.resume		= pxa_camera_resume,
 };
 
 
-- 
1.5.5.3

--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list