Changeset 777 for GPL/trunk/alsa-kernel/include/sound/memalloc.h

Timestamp:

Apr 21, 2025, 7:17:25 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge from uniaud32-exp branch

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/sound/memalloc.h (modified) (1 diff)

GPL/trunk/alsa-kernel/include/sound/memalloc.h

@@ -43 +43 @@
 #define SNDRV_DMA_TYPE_NONCOHERENT      9       /* non-coherent buffer */
 #ifdef CONFIG_SND_DMA_SGBUF
-#define SNDRV_DMA_TYPE_DEV_SG           SNDRV_DMA_TYPE_NONCONTIG
+#define SNDRV_DMA_TYPE_DEV_SG           3       /* S/G pages */
 #define SNDRV_DMA_TYPE_DEV_WC_SG        6       /* SG write-combined */
 #else
 #define SNDRV_DMA_TYPE_DEV_SG   SNDRV_DMA_TYPE_DEV /* no SG-buf support */
 #define SNDRV_DMA_TYPE_DEV_WC_SG        SNDRV_DMA_TYPE_DEV_WC
-#endif
-/* fallback types, don't use those directly */
-#ifdef CONFIG_SND_DMA_SGBUF
-#define SNDRV_DMA_TYPE_DEV_SG_FALLBACK          10
-#define SNDRV_DMA_TYPE_DEV_WC_SG_FALLBACK       11
 #endif