[PATCH] pxa_camera: move fifo reset direct before dma start

[PATCH] pxa_camera: move fifo reset direct before dma start

[Stefan Herbrechtsmeier]

Move the fifo reset from pxa_camera_start_capture to pxa_camera_irq direct
before the dma start after an end of frame interrupt to prevent images from
shifting because of old data at the begin of the frame.

Signed-off-by: Stefan Herbrechtsmeier <hbmeier@hni.uni-paderborn.de>
---
 drivers/media/video/pxa_camera.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index 5ecc30d..04bf5c1 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -609,12 +609,9 @@ static void pxa_dma_add_tail_buf(struct pxa_camera_dev *pcdev,
  */
 static void pxa_camera_start_capture(struct pxa_camera_dev *pcdev)
 {
-	unsigned long cicr0, cifr;
+	unsigned long cicr0;
 
 	dev_dbg(pcdev->soc_host.v4l2_dev.dev, "%s\n", __func__);
-	/* Reset the FIFOs */
-	cifr = __raw_readl(pcdev->base + CIFR) | CIFR_RESET_F;
-	__raw_writel(cifr, pcdev->base + CIFR);
 	/* Enable End-Of-Frame Interrupt */
 	cicr0 = __raw_readl(pcdev->base + CICR0) | CICR0_ENB;
 	cicr0 &= ~CICR0_EOFM;
@@ -935,7 +932,7 @@ static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev)
 static irqreturn_t pxa_camera_irq(int irq, void *data)
 {
 	struct pxa_camera_dev *pcdev = data;
-	unsigned long status, cicr0;
+	unsigned long status, cifr, cicr0;
 	struct pxa_buffer *buf;
 	struct videobuf_buffer *vb;
 
@@ -949,6 +946,10 @@ static irqreturn_t pxa_camera_irq(int irq, void *data)
 	__raw_writel(status, pcdev->base + CISR);
 
 	if (status & CISR_EOF) {
+		/* Reset the FIFOs */
+		cifr = __raw_readl(pcdev->base + CIFR) | CIFR_RESET_F;
+		__raw_writel(cifr, pcdev->base + CIFR);
+
 		pcdev->active = list_first_entry(&pcdev->capture,
 					   struct pxa_buffer, vb.queue);
 		vb = &pcdev->active->vb;
-- 
1.5.4.3

Re: [PATCH] pxa_camera: move fifo reset direct before dma start

[Guennadi Liakhovetski]

Robert, what do you think? Are you still working with PXA camera?

Thanks
Guennadi

On Tue, 20 Apr 2010, Stefan Herbrechtsmeier wrote:

> Move the fifo reset from pxa_camera_start_capture to pxa_camera_irq direct
> before the dma start after an end of frame interrupt to prevent images from
> shifting because of old data at the begin of the frame.
> 
> Signed-off-by: Stefan Herbrechtsmeier <hbmeier@hni.uni-paderborn.de>
> ---
>  drivers/media/video/pxa_camera.c |   11 ++++++-----
>  1 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
> index 5ecc30d..04bf5c1 100644
> --- a/drivers/media/video/pxa_camera.c
> +++ b/drivers/media/video/pxa_camera.c
> @@ -609,12 +609,9 @@ static void pxa_dma_add_tail_buf(struct pxa_camera_dev *pcdev,
>   */
>  static void pxa_camera_start_capture(struct pxa_camera_dev *pcdev)
>  {
> -	unsigned long cicr0, cifr;
> +	unsigned long cicr0;
>  
>  	dev_dbg(pcdev->soc_host.v4l2_dev.dev, "%s\n", __func__);
> -	/* Reset the FIFOs */
> -	cifr = __raw_readl(pcdev->base + CIFR) | CIFR_RESET_F;
> -	__raw_writel(cifr, pcdev->base + CIFR);
>  	/* Enable End-Of-Frame Interrupt */
>  	cicr0 = __raw_readl(pcdev->base + CICR0) | CICR0_ENB;
>  	cicr0 &= ~CICR0_EOFM;
> @@ -935,7 +932,7 @@ static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev)
>  static irqreturn_t pxa_camera_irq(int irq, void *data)
>  {
>  	struct pxa_camera_dev *pcdev = data;
> -	unsigned long status, cicr0;
> +	unsigned long status, cifr, cicr0;
>  	struct pxa_buffer *buf;
>  	struct videobuf_buffer *vb;
>  
> @@ -949,6 +946,10 @@ static irqreturn_t pxa_camera_irq(int irq, void *data)
>  	__raw_writel(status, pcdev->base + CISR);
>  
>  	if (status & CISR_EOF) {
> +		/* Reset the FIFOs */
> +		cifr = __raw_readl(pcdev->base + CIFR) | CIFR_RESET_F;
> +		__raw_writel(cifr, pcdev->base + CIFR);
> +
>  		pcdev->active = list_first_entry(&pcdev->capture,
>  					   struct pxa_buffer, vb.queue);
>  		vb = &pcdev->active->vb;
> -- 
> 1.5.4.3
> 

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

Re: [PATCH] pxa_camera: move fifo reset direct before dma start

[Robert Jarzmik]

Guennadi Liakhovetski <g.liakhovetski@gmx.de> writes:

> Robert, what do you think? Are you still working with PXA camera?
Hi Guennadi,

Yes, I'm still working with pxa_camera :)

About the patch, I have a very good feeling about it. I have not tested it, but
it looks good to me. I'll assume Stefan has tested it, and if you want it,
please take my :
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>

Cheers.

--
Robert

Re: [PATCH] pxa_camera: move fifo reset direct before dma start

[Antonio Ospite]

[-- Attachment #1: Type: text/plain, Size: 1012 bytes --]

On Tue, 20 Apr 2010 19:36:13 +0200
Robert Jarzmik <robert.jarzmik@free.fr> wrote:

> Guennadi Liakhovetski <g.liakhovetski@gmx.de> writes:
> 
> > Robert, what do you think? Are you still working with PXA camera?
> Hi Guennadi,
> 
> Yes, I'm still working with pxa_camera :)
> 
> About the patch, I have a very good feeling about it. I have not tested it, but
> it looks good to me. I'll assume Stefan has tested it, and if you want it,
> please take my :
> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
>

FWIW,
Tested-by: Antonio Ospite <ospite@studenti.unina.it>

It works on Motorola A780: pxa_camera + mt9m111
The first picture is now ok.

Thanks Stefan.

Ciao ciao,
   Antonio

-- 
Antonio Ospite
http://ao2.it

PGP public key ID: 0x4553B001

A: Because it messes up the order in which people normally read text.
   See http://en.wikipedia.org/wiki/Posting_style
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing in e-mail?

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] pxa_camera: move fifo reset direct before dma start

[Jonathan Cameron]

On 04/21/10 11:06, Antonio Ospite wrote:
> On Tue, 20 Apr 2010 19:36:13 +0200
> Robert Jarzmik <robert.jarzmik@free.fr> wrote:
> 
>> Guennadi Liakhovetski <g.liakhovetski@gmx.de> writes:
>>
>>> Robert, what do you think? Are you still working with PXA camera?
>> Hi Guennadi,
>>
>> Yes, I'm still working with pxa_camera :)
>>
>> About the patch, I have a very good feeling about it. I have not tested it, but
>> it looks good to me. I'll assume Stefan has tested it, and if you want it,
>> please take my :
>> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
>>
> 
> FWIW,
> Tested-by: Antonio Ospite <ospite@studenti.unina.it>
> 
> It works on Motorola A780: pxa_camera + mt9m111
> The first picture is now ok.
> 
> Thanks Stefan.
> 
> Ciao ciao,
>    Antonio
> 
Excellent, I'm not in a position to test right now, but glad
to see this issue cleaned up.

Jonathan