Skip to contentSkip to conversation

omap-alsa, force the dma to receive irqs on all omap15xx based devices.

PATCH In review lamikr 2 participants 2 messages May 31, 2006 Sound

lore
Share & tools
lore

lamikr

author
#0 lore raw

PATCH 1/1 omap-alsa, force the dma to receive irqs on all omap15xx based devices.

Hi

According to tests made by James Selvam, this patch is also needed in other omap1510 based devices that with iPAQ h6300.
I suggest adding this patch unless someone finds out a bug in upper level explaining the need for stopping the dma in every round to be able to get the irq.

Mika

Quoted 1 line

From nobody Mon Sep 17 00:00:00 2001

From: Mika Laitio <[email protected]>
Date: Wed May 31 02:08:16 2006 +0300
Subject: [PATCH] omap-alsa, force the dma to receive irqs on all omap15xx based devices.

---

 sound/arm/omap/omap-alsa.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

8dcab62d5f3e6cb4ba4f8d1b677d94694036e4ae

sound/arm/omap/omap-alsa.c +8 -2
index 328003b..5a68471 100644
@@ -190,7 +190,7 @@ static void audio_process_dma(struct aud
 	unsigned int dma_size;
 	unsigned int offset;
 	int ret;
-#ifdef CONFIG_MACH_OMAP_H6300
+#ifdef CONFIG_ARCH_OMAP15XX
 	unsigned long flags;
 #endif
 	
@@ -200,7 +200,13 @@ static void audio_process_dma(struct aud
 		dma_size = frames_to_bytes(runtime, runtime->period_size);
 		offset = dma_size * s->period;
 		snd_assert(dma_size <= DMA_BUF_SIZE,);
-#ifdef CONFIG_MACH_OMAP_H6300
+#ifdef CONFIG_ARCH_OMAP15XX
+		/*
+		 * On omap1510 based devices, we need to call the stop_dma
+		 * before calling the start_dma or we will not receive the
+		 * irq from DMA after the first transfered/played buffer.
+		 * (invocation of callback_omap_alsa_sound_dma() method).
+		 */
 		spin_lock_irqsave(&s->dma_lock, flags);
 		omap_stop_alsa_sound_dma(s);
 		spin_unlock_irqrestore(&s->dma_lock, flags);
Signature · 1 line
1.2.2
#1 lore raw
Quoted 6 lines · lamikr

According to tests made by James Selvam, this patch is also needed in other omap1510 based devices that with iPAQ h6300.

I suggest adding this patch unless someone finds out a bug in upper level explaining the need for stopping the dma in every round to be able to get the irq.

As well as the #ifdef should it not be wrapped in "if (cpu_is_omap15xx()) {...}"?

Also I know Mark Underwood hit an issue on the Amstrad Delta where he had to call omap_start_dma(); I don't know if this is an alternative fix or not so I've cc'd him in case he has some input.

Quoted 44 lines
Quoted 1 line

From nobody Mon Sep 17 00:00:00 2001

From: Mika Laitio <[email protected]>
Date: Wed May 31 02:08:16 2006 +0300
Subject: [PATCH] omap-alsa, force the dma to receive irqs on all omap15xx based devices.

---

 sound/arm/omap/omap-alsa.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

8dcab62d5f3e6cb4ba4f8d1b677d94694036e4ae

sound/arm/omap/omap-alsa.c +8 -2
index 328003b..5a68471 100644
@@ -190,7 +190,7 @@ static void audio_process_dma(struct aud
 	unsigned int dma_size;
 	unsigned int offset;
 	int ret;
-#ifdef CONFIG_MACH_OMAP_H6300
+#ifdef CONFIG_ARCH_OMAP15XX
 	unsigned long flags;
 #endif
 
@@ -200,7 +200,13 @@ static void audio_process_dma(struct aud
 		dma_size = frames_to_bytes(runtime, runtime->period_size);
 		offset = dma_size * s->period;
 		snd_assert(dma_size <= DMA_BUF_SIZE,);
-#ifdef CONFIG_MACH_OMAP_H6300
+#ifdef CONFIG_ARCH_OMAP15XX
+		/*
+		 * On omap1510 based devices, we need to call the stop_dma
+		 * before calling the start_dma or we will not receive the
+		 * irq from DMA after the first transfered/played buffer.
+		 * (invocation of callback_omap_alsa_sound_dma() method).
+		 */
 		spin_lock_irqsave(&s->dma_lock, flags);
 		omap_stop_alsa_sound_dma(s);
 		spin_unlock_irqrestore(&s->dma_lock, flags);
Signature · 1 line
1.2.2

J.

Signature · 1 line
I don't sleep, I dream.