Skip to content

Commit c31427d

Browse files
committed
ALSA: hda: No preallocation on x86 platforms
Like many other drivers, HD-audio drivers also do PCM buffer preallocation to assure the buffer pages allocated at the early boot stage. This step is useful for platforms that may fail to allocate the PCM hardware buffers -- which is mostly for either large continuous pages or with the specific DMA mask (like emu10k1). OTOH, when a buffer is allocated as SG-buffer and the DMA mask is either 32 or 64 bits, the allocation almost never fails unless it hits the real OOM situation. In such a case, we don't need the preallocation inevitably unlike the cases above. That said, we may drop the preallocation for HD-audio that does allocate via SG-buffers, and the patch achieves it. However, there is one caveat: the buffer allocation behavior depends on CONFIG_SND_DMA_SGBUF, and it falls back to the continuous pages when it's not set. And, currently this SG buffer allocation is enabled only on x86 platforms. So, covering those fall-outs, the patch adjusts CONFIG_SND_HDA_PREALLOC_SIZE depending on the condition, and keeps the old behavior as-is for non-x86 platforms. On x86, the kconfig item is no longer adjustable but always set to zero for disabling the preallocation. You can still enable the preallocation via procfs interface at any time later, too. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent d4cfb30 commit c31427d

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

sound/hda/Kconfig

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@ config SND_HDA_EXT_CORE
2121
select SND_HDA_CORE
2222

2323
config SND_HDA_PREALLOC_SIZE
24-
int "Pre-allocated buffer size for HD-audio driver"
24+
int "Pre-allocated buffer size for HD-audio driver" if !SND_DMA_SGBUF
2525
range 0 32768
26-
default 64
26+
default 0 if SND_DMA_SGBUF
27+
default 64 if !SND_DMA_SGBUF
2728
help
2829
Specifies the default pre-allocated buffer-size in kB for the
2930
HD-audio driver. A larger buffer (e.g. 2048) is preferred
3031
for systems using PulseAudio. The default 64 is chosen just
3132
for compatibility reasons.
33+
On x86 systems, the default is zero as we need no preallocation.
3234

3335
Note that the pre-allocation size can be changed dynamically
3436
via a proc file (/proc/asound/card*/pcm*/sub*/prealloc), too.

0 commit comments

Comments
 (0)