diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-01-10 08:20:42 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-06 14:08:15 -0500 |
commit | 6d6c9853a8484a22c3aaada5664b15afae1f31cd (patch) | |
tree | d89a2a402d8ad15a4338f0ba284ffa46fc45dda5 | |
parent | ebd58143b76236f0c4613fc0440858a52c6d8cdf (diff) |
ALSA: Enable CONFIG_ZONE_DMA for smaller PCI DMA masks
commit 80ab8eae70e51d578ebbeb228e0f7a562471b8b7 upstream.
The PCI devices with DMA masks smaller than 32bit should enable
CONFIG_ZONE_DMA. Since the recent change of page allocator, page
allocations via dma_alloc_coherent() with the limited DMA mask bits
may fail more frequently, ended up with no available buffers, when
CONFIG_ZONE_DMA isn't enabled. With CONFIG_ZONE_DMA, the system has
much more chance to obtain such pages.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=68221
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | sound/pci/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index fe6fa93a6262..daac7c7ebe9e 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
@@ -30,6 +30,7 @@ config SND_ALS300 | |||
30 | select SND_PCM | 30 | select SND_PCM |
31 | select SND_AC97_CODEC | 31 | select SND_AC97_CODEC |
32 | select SND_OPL3_LIB | 32 | select SND_OPL3_LIB |
33 | select ZONE_DMA | ||
33 | help | 34 | help |
34 | Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+ | 35 | Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+ |
35 | 36 | ||
@@ -54,6 +55,7 @@ config SND_ALI5451 | |||
54 | tristate "ALi M5451 PCI Audio Controller" | 55 | tristate "ALi M5451 PCI Audio Controller" |
55 | select SND_MPU401_UART | 56 | select SND_MPU401_UART |
56 | select SND_AC97_CODEC | 57 | select SND_AC97_CODEC |
58 | select ZONE_DMA | ||
57 | help | 59 | help |
58 | Say Y here to include support for the integrated AC97 sound | 60 | Say Y here to include support for the integrated AC97 sound |
59 | device on motherboards using the ALi M5451 Audio Controller | 61 | device on motherboards using the ALi M5451 Audio Controller |
@@ -158,6 +160,7 @@ config SND_AZT3328 | |||
158 | select SND_PCM | 160 | select SND_PCM |
159 | select SND_RAWMIDI | 161 | select SND_RAWMIDI |
160 | select SND_AC97_CODEC | 162 | select SND_AC97_CODEC |
163 | select ZONE_DMA | ||
161 | help | 164 | help |
162 | Say Y here to include support for Aztech AZF3328 (PCI168) | 165 | Say Y here to include support for Aztech AZF3328 (PCI168) |
163 | soundcards. | 166 | soundcards. |
@@ -463,6 +466,7 @@ config SND_EMU10K1 | |||
463 | select SND_HWDEP | 466 | select SND_HWDEP |
464 | select SND_RAWMIDI | 467 | select SND_RAWMIDI |
465 | select SND_AC97_CODEC | 468 | select SND_AC97_CODEC |
469 | select ZONE_DMA | ||
466 | help | 470 | help |
467 | Say Y to include support for Sound Blaster PCI 512, Live!, | 471 | Say Y to include support for Sound Blaster PCI 512, Live!, |
468 | Audigy and E-mu APS (partially supported) soundcards. | 472 | Audigy and E-mu APS (partially supported) soundcards. |
@@ -478,6 +482,7 @@ config SND_EMU10K1X | |||
478 | tristate "Emu10k1X (Dell OEM Version)" | 482 | tristate "Emu10k1X (Dell OEM Version)" |
479 | select SND_AC97_CODEC | 483 | select SND_AC97_CODEC |
480 | select SND_RAWMIDI | 484 | select SND_RAWMIDI |
485 | select ZONE_DMA | ||
481 | help | 486 | help |
482 | Say Y here to include support for the Dell OEM version of the | 487 | Say Y here to include support for the Dell OEM version of the |
483 | Sound Blaster Live!. | 488 | Sound Blaster Live!. |
@@ -511,6 +516,7 @@ config SND_ES1938 | |||
511 | select SND_OPL3_LIB | 516 | select SND_OPL3_LIB |
512 | select SND_MPU401_UART | 517 | select SND_MPU401_UART |
513 | select SND_AC97_CODEC | 518 | select SND_AC97_CODEC |
519 | select ZONE_DMA | ||
514 | help | 520 | help |
515 | Say Y here to include support for soundcards based on ESS Solo-1 | 521 | Say Y here to include support for soundcards based on ESS Solo-1 |
516 | (ES1938, ES1946, ES1969) chips. | 522 | (ES1938, ES1946, ES1969) chips. |
@@ -522,6 +528,7 @@ config SND_ES1968 | |||
522 | tristate "ESS ES1968/1978 (Maestro-1/2/2E)" | 528 | tristate "ESS ES1968/1978 (Maestro-1/2/2E)" |
523 | select SND_MPU401_UART | 529 | select SND_MPU401_UART |
524 | select SND_AC97_CODEC | 530 | select SND_AC97_CODEC |
531 | select ZONE_DMA | ||
525 | help | 532 | help |
526 | Say Y here to include support for soundcards based on ESS Maestro | 533 | Say Y here to include support for soundcards based on ESS Maestro |
527 | 1/2/2E chips. | 534 | 1/2/2E chips. |
@@ -603,6 +610,7 @@ config SND_ICE1712 | |||
603 | select SND_MPU401_UART | 610 | select SND_MPU401_UART |
604 | select SND_AC97_CODEC | 611 | select SND_AC97_CODEC |
605 | select BITREVERSE | 612 | select BITREVERSE |
613 | select ZONE_DMA | ||
606 | help | 614 | help |
607 | Say Y here to include support for soundcards based on the | 615 | Say Y here to include support for soundcards based on the |
608 | ICE1712 (Envy24) chip. | 616 | ICE1712 (Envy24) chip. |
@@ -690,6 +698,7 @@ config SND_LX6464ES | |||
690 | config SND_MAESTRO3 | 698 | config SND_MAESTRO3 |
691 | tristate "ESS Allegro/Maestro3" | 699 | tristate "ESS Allegro/Maestro3" |
692 | select SND_AC97_CODEC | 700 | select SND_AC97_CODEC |
701 | select ZONE_DMA | ||
693 | help | 702 | help |
694 | Say Y here to include support for soundcards based on ESS Maestro 3 | 703 | Say Y here to include support for soundcards based on ESS Maestro 3 |
695 | (Allegro) chips. | 704 | (Allegro) chips. |
@@ -786,6 +795,7 @@ config SND_SIS7019 | |||
786 | tristate "SiS 7019 Audio Accelerator" | 795 | tristate "SiS 7019 Audio Accelerator" |
787 | depends on X86 && !X86_64 | 796 | depends on X86 && !X86_64 |
788 | select SND_AC97_CODEC | 797 | select SND_AC97_CODEC |
798 | select ZONE_DMA | ||
789 | help | 799 | help |
790 | Say Y here to include support for the SiS 7019 Audio Accelerator. | 800 | Say Y here to include support for the SiS 7019 Audio Accelerator. |
791 | 801 | ||
@@ -797,6 +807,7 @@ config SND_SONICVIBES | |||
797 | select SND_OPL3_LIB | 807 | select SND_OPL3_LIB |
798 | select SND_MPU401_UART | 808 | select SND_MPU401_UART |
799 | select SND_AC97_CODEC | 809 | select SND_AC97_CODEC |
810 | select ZONE_DMA | ||
800 | help | 811 | help |
801 | Say Y here to include support for soundcards based on the S3 | 812 | Say Y here to include support for soundcards based on the S3 |
802 | SonicVibes chip. | 813 | SonicVibes chip. |
@@ -808,6 +819,7 @@ config SND_TRIDENT | |||
808 | tristate "Trident 4D-Wave DX/NX; SiS 7018" | 819 | tristate "Trident 4D-Wave DX/NX; SiS 7018" |
809 | select SND_MPU401_UART | 820 | select SND_MPU401_UART |
810 | select SND_AC97_CODEC | 821 | select SND_AC97_CODEC |
822 | select ZONE_DMA | ||
811 | help | 823 | help |
812 | Say Y here to include support for soundcards based on Trident | 824 | Say Y here to include support for soundcards based on Trident |
813 | 4D-Wave DX/NX or SiS 7018 chips. | 825 | 4D-Wave DX/NX or SiS 7018 chips. |