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

Timestamp:

Aug 7, 2022, 6:11:12 PM (3 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

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

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

@@ -32 +32 @@
 #define SNDRV_DMA_TYPE_CONTINUOUS       1       /* continuous no-DMA memory */
 #define SNDRV_DMA_TYPE_DEV              2       /* generic device continuous */
-#define SNDRV_DMA_TYPE_DEV_UC           5       /* continuous non-cahced */
+#define SNDRV_DMA_TYPE_DEV_WC           5       /* continuous write-combined */
 #ifdef CONFIG_SND_DMA_SGBUF
 #define SNDRV_DMA_TYPE_DEV_SG           3       /* generic device SG-buffer */
-#define SNDRV_DMA_TYPE_DEV_UC_SG        6       /* SG non-cached */
+#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_UC_SG        SNDRV_DMA_TYPE_DEV_UC
+#define SNDRV_DMA_TYPE_DEV_WC_SG        SNDRV_DMA_TYPE_DEV_WC
 #endif
 #ifdef CONFIG_GENERIC_ALLOCATOR
@@ -80 +80 @@
                                       unsigned int ofs, unsigned int size);
 
+/* device-managed memory allocator */
+struct snd_dma_buffer *snd_devm_alloc_pages(struct device *dev, int type,
+                                            size_t size);
+#ifdef TARGET_OS2
+int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab);
+void *snd_malloc_sgbuf_pages(struct device *device,
+                             size_t size, struct snd_dma_buffer *dmab,
+                             size_t *res_size);
+
+#endif
 #endif /* __SOUND_MEMALLOC_H */