aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_intel.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-07-12 11:27:46 -0400
committerTakashi Iwai <tiwai@suse.de>2011-07-12 11:31:46 -0400
commitacfa634f7e199193ec28282e82a5a6dd8edebcb7 (patch)
tree49193fcf5bb5c21f61d1ff7d8a7e404ce4e774ad /sound/pci/hda/hda_intel.c
parent30b4503378c976cf66201a1e81820519f6bd79ac (diff)
ALSA: hda - Add Kconfig for the default buffer size
Add a Kconfig entry to specify the default buffer size. Distros using PulseAudio can choose a larger value here. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-rw-r--r--sound/pci/hda/hda_intel.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 25619cd1883..5ce9531cba6 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2075,6 +2075,8 @@ static void azx_pcm_free(struct snd_pcm *pcm)
2075 } 2075 }
2076} 2076}
2077 2077
2078#define MAX_PREALLOC_SIZE (32 * 1024 * 1024)
2079
2078static int 2080static int
2079azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec, 2081azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
2080 struct hda_pcm *cpcm) 2082 struct hda_pcm *cpcm)
@@ -2083,6 +2085,7 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
2083 struct snd_pcm *pcm; 2085 struct snd_pcm *pcm;
2084 struct azx_pcm *apcm; 2086 struct azx_pcm *apcm;
2085 int pcm_dev = cpcm->device; 2087 int pcm_dev = cpcm->device;
2088 unsigned int size;
2086 int s, err; 2089 int s, err;
2087 2090
2088 if (pcm_dev >= HDA_MAX_PCMS) { 2091 if (pcm_dev >= HDA_MAX_PCMS) {
@@ -2118,9 +2121,12 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
2118 snd_pcm_set_ops(pcm, s, &azx_pcm_ops); 2121 snd_pcm_set_ops(pcm, s, &azx_pcm_ops);
2119 } 2122 }
2120 /* buffer pre-allocation */ 2123 /* buffer pre-allocation */
2124 size = CONFIG_SND_HDA_PREALLOC_SIZE * 1024;
2125 if (size > MAX_PREALLOC_SIZE)
2126 size = MAX_PREALLOC_SIZE;
2121 snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, 2127 snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
2122 snd_dma_pci_data(chip->pci), 2128 snd_dma_pci_data(chip->pci),
2123 1024 * 64, 32 * 1024 * 1024); 2129 size, MAX_PREALLOC_SIZE);
2124 return 0; 2130 return 0;
2125} 2131}
2126 2132