[PATCH] ALSA: ctxfi: Bump playback substreams to 256

[PATCH] ALSA: ctxfi: Bump playback substreams to 256

[Maarten Lankhorst]

There are references in the code to 256 sources, so I tested it with 256 aplays,
of which the first and last with real data and the rest playing /dev/zero .

Also increase amount of page tables, so the default aplay size works.

Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>

---
diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c
index 457d211..2c86226 100644
--- a/sound/pci/ctxfi/ctpcm.c
+++ b/sound/pci/ctxfi/ctpcm.c
@@ -404,7 +404,7 @@ int ct_alsa_pcm_create(struct ct_atc *atc,
 	int err;
 	int playback_count, capture_count;
 
-	playback_count = (IEC958 == device) ? 1 : 8;
+	playback_count = (IEC958 == device) ? 1 : 256;
 	capture_count = (FRONT == device) ? 1 : 0;
 	err = snd_pcm_new(atc->card, "ctxfi", device,
 			  playback_count, capture_count, &pcm);
diff --git a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c
index c749fa7..e134b3a 100644
--- a/sound/pci/ctxfi/ctsrc.c
+++ b/sound/pci/ctxfi/ctsrc.c
@@ -20,7 +20,7 @@
 #include "cthardware.h"
 #include <linux/slab.h>
 
-#define SRC_RESOURCE_NUM	64
+#define SRC_RESOURCE_NUM	256
 #define SRCIMP_RESOURCE_NUM	256
 
 static unsigned int conj_mask;
diff --git a/sound/pci/ctxfi/ctvmem.h b/sound/pci/ctxfi/ctvmem.h
index b23adfc..e6da60e 100644
--- a/sound/pci/ctxfi/ctvmem.h
+++ b/sound/pci/ctxfi/ctvmem.h
@@ -18,7 +18,7 @@
 #ifndef CTVMEM_H
 #define CTVMEM_H
 
-#define CT_PTP_NUM	1	/* num of device page table pages */
+#define CT_PTP_NUM	4	/* num of device page table pages */
 
 #include <linux/mutex.h>
 #include <linux/list.h>

Re: [PATCH] ALSA: ctxfi: Bump playback substreams to 256

[Takashi Iwai]

At Wed, 24 Aug 2011 00:48:59 +0200,
Maarten Lankhorst wrote:
> 
> There are references in the code to 256 sources, so I tested it with 256 aplays,
> of which the first and last with real data and the rest playing /dev/zero .
> 
> Also increase amount of page tables, so the default aplay size works.
> 
> Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>

Applied now.  Thanks.


Takashi

> ---
> diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c
> index 457d211..2c86226 100644
> --- a/sound/pci/ctxfi/ctpcm.c
> +++ b/sound/pci/ctxfi/ctpcm.c
> @@ -404,7 +404,7 @@ int ct_alsa_pcm_create(struct ct_atc *atc,
>  	int err;
>  	int playback_count, capture_count;
>  
> -	playback_count = (IEC958 == device) ? 1 : 8;
> +	playback_count = (IEC958 == device) ? 1 : 256;
>  	capture_count = (FRONT == device) ? 1 : 0;
>  	err = snd_pcm_new(atc->card, "ctxfi", device,
>  			  playback_count, capture_count, &pcm);
> diff --git a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c
> index c749fa7..e134b3a 100644
> --- a/sound/pci/ctxfi/ctsrc.c
> +++ b/sound/pci/ctxfi/ctsrc.c
> @@ -20,7 +20,7 @@
>  #include "cthardware.h"
>  #include <linux/slab.h>
>  
> -#define SRC_RESOURCE_NUM	64
> +#define SRC_RESOURCE_NUM	256
>  #define SRCIMP_RESOURCE_NUM	256
>  
>  static unsigned int conj_mask;
> diff --git a/sound/pci/ctxfi/ctvmem.h b/sound/pci/ctxfi/ctvmem.h
> index b23adfc..e6da60e 100644
> --- a/sound/pci/ctxfi/ctvmem.h
> +++ b/sound/pci/ctxfi/ctvmem.h
> @@ -18,7 +18,7 @@
>  #ifndef CTVMEM_H
>  #define CTVMEM_H
>  
> -#define CT_PTP_NUM	1	/* num of device page table pages */
> +#define CT_PTP_NUM	4	/* num of device page table pages */
>  
>  #include <linux/mutex.h>
>  #include <linux/list.h>
>