Ignore:
Timestamp:
Aug 7, 2022, 6:11:12 PM (3 years ago)
Author:
David Azarewicz
Message:

Merge changes from next branch.

Location:
GPL/trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • GPL/trunk

  • GPL/trunk/alsa-kernel/include/sound/compress_driver.h

    r695 r717  
    166166
    167167/* compress device register APIs */
    168 int snd_compress_register(struct snd_compr *device);
    169 int snd_compress_deregister(struct snd_compr *device);
    170168int snd_compress_new(struct snd_card *card, int device,
    171169                        int type, const char *id, struct snd_compr *compr);

  • GPL/trunk/alsa-kernel/include/sound/core.h

    r703 r717  
    121121        const struct attribute_group *dev_groups[4]; /* assigned sysfs attr */
    122122        bool registered;                /* card_dev is registered? */
     123        bool managed;                   /* managed via devres */
     124        bool releasing;                 /* during card free process */
    123125        int sync_irq;                   /* assigned irq, used for PCM sync */
    124126        wait_queue_head_t remove_sleep;
    … …  
    278280                 struct module *module, int extra_size,
    279281                 struct snd_card **card_ret);
     282int snd_devm_card_new(struct device *parent, int idx, const char *xid,
     283                      struct module *module, size_t extra_size,
     284                      struct snd_card **card_ret);
    280285
    281286int snd_card_disconnect(struct snd_card *card);
    … …  
    283288int snd_card_free(struct snd_card *card);
    284289int snd_card_free_when_closed(struct snd_card *card);
     290int snd_card_free_on_error(struct device *dev, int ret);
    285291void snd_card_set_id(struct snd_card *card, const char *id);
    286292int snd_card_register(struct snd_card *card);
    … …  
    328334void snd_dma_disable(unsigned long dma);
    329335unsigned int snd_dma_pointer(unsigned long dma, unsigned int size);
     336int snd_devm_request_dma(struct device *dev, int dma, const char *name);
    330337#endif
    331338

  • GPL/trunk/alsa-kernel/include/sound/emu10k1.h

    r679 r717  
    17021702        struct snd_dma_buffer ptb_pages;        /* page table pages */
    17031703        struct snd_dma_device p16v_dma_dev;
    1704         struct snd_dma_buffer p16v_buffer;
     1704        struct snd_dma_buffer *p16v_buffer;
    17051705
    17061706        struct snd_util_memhdr *memhdr;         /* page allocation list */
    … …  
    17971797                       long max_cache_bytes,
    17981798                       int enable_ir,
    1799                        uint subsystem,
    1800                        struct snd_emu10k1 ** remu);
     1799                       uint subsystem);
    18011800
    18021801int snd_emu10k1_pcm(struct snd_emu10k1 *emu, int device);
    … …  
    18041803int snd_emu10k1_pcm_efx(struct snd_emu10k1 *emu, int device);
    18051804int snd_p16v_pcm(struct snd_emu10k1 *emu, int device);
    1806 int snd_p16v_free(struct snd_emu10k1 * emu);
    18071805int snd_p16v_mixer(struct snd_emu10k1 * emu);
    18081806int snd_emu10k1_pcm_multi(struct snd_emu10k1 *emu, int device);

  • GPL/trunk/alsa-kernel/include/sound/emu8000.h

    r679 r717  
    5757        unsigned long port2;    /* Port usually at base+0x400 */
    5858        unsigned long port3;    /* Port usually at base+0x800 */
    59         struct resource *res_port1;
    60         struct resource *res_port2;
    61         struct resource *res_port3;
    6259        unsigned short last_reg;/* Last register command */
    6360        spinlock_t reg_lock;

  • GPL/trunk/alsa-kernel/include/sound/hda_codec.h

    r695 r717  
    99#define __SOUND_HDA_CODEC_H
    1010
    11 #include <linux/kref.h>
     11#include <linux/refcount.h>
    1212#include <linux/mod_devicetable.h>
    1313#include <sound/info.h>
    … …  
    115115        int (*check_power_status)(struct hda_codec *codec, hda_nid_t nid);
    116116#endif
    117         void (*reboot_notify)(struct hda_codec *codec);
    118117        void (*stream_pm)(struct hda_codec *codec, hda_nid_t nid, bool on);
    119118};
    … …  
    168167        /* private: */
    169168        struct hda_codec *codec;
    170         struct kref kref;
    171169        struct list_head list;
     170        unsigned int disconnected:1;
    172171};
    173172
    … …  
    189188        /* PCM to create, set by patch_ops.build_pcms callback */
    190189        struct list_head pcm_list_head;
     190        refcount_t pcm_ref;
     191        wait_queue_head_t remove_sleep;
    191192
    192193        /* codec specific info */
    … …  
    226227
    227228        /* misc flags */
     229        unsigned int configured:1; /* codec was configured */
    228230        unsigned int in_freeing:1; /* being released */
    229231        unsigned int registered:1; /* codec was registered */
    … …  
    423425static inline void snd_hda_codec_pcm_get(struct hda_pcm *pcm)
    424426{
    425         kref_get(&pcm->kref);
     427        refcount_inc(&pcm->codec->pcm_ref);
    426428}
    427429void snd_hda_codec_pcm_put(struct hda_pcm *pcm);

  • GPL/trunk/alsa-kernel/include/sound/hdaudio_ext.h

    r695 r717  
    5252 * @link_locked: link is locked
    5353 * @link_prepared: link is prepared
    54  * link_substream: link substream
     54 * @link_substream: link substream
    5555 */
    5656struct hdac_ext_stream {
    … …  
    8989                                           int type);
    9090void snd_hdac_ext_stream_release(struct hdac_ext_stream *azx_dev, int type);
     91void snd_hdac_ext_stream_decouple_locked(struct hdac_bus *bus,
     92                                  struct hdac_ext_stream *azx_dev, bool decouple);
    9193void snd_hdac_ext_stream_decouple(struct hdac_bus *bus,
    9294                                struct hdac_ext_stream *azx_dev, bool decouple);

  • GPL/trunk/alsa-kernel/include/sound/jack.h

    r695 r717  
    6363#ifdef CONFIG_SND_JACK_INPUT_DEV
    6464        struct input_dev *input_dev;
     65        struct mutex input_dev_lock;
    6566        int registered;
    6667        int type;

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

    r703 r717  
    3232#define SNDRV_DMA_TYPE_CONTINUOUS       1       /* continuous no-DMA memory */
    3333#define SNDRV_DMA_TYPE_DEV              2       /* generic device continuous */
    34 #define SNDRV_DMA_TYPE_DEV_UC           5       /* continuous non-cahced */
     34#define SNDRV_DMA_TYPE_DEV_WC           5       /* continuous write-combined */
    3535#ifdef CONFIG_SND_DMA_SGBUF
    3636#define SNDRV_DMA_TYPE_DEV_SG           3       /* generic device SG-buffer */
    37 #define SNDRV_DMA_TYPE_DEV_UC_SG        6       /* SG non-cached */
     37#define SNDRV_DMA_TYPE_DEV_WC_SG        6       /* SG write-combined */
    3838#else
    3939#define SNDRV_DMA_TYPE_DEV_SG   SNDRV_DMA_TYPE_DEV /* no SG-buf support */
    40 #define SNDRV_DMA_TYPE_DEV_UC_SG        SNDRV_DMA_TYPE_DEV_UC
     40#define SNDRV_DMA_TYPE_DEV_WC_SG        SNDRV_DMA_TYPE_DEV_WC
    4141#endif
    4242#ifdef CONFIG_GENERIC_ALLOCATOR
    … …  
    8080                                      unsigned int ofs, unsigned int size);
    8181
     82/* device-managed memory allocator */
     83struct snd_dma_buffer *snd_devm_alloc_pages(struct device *dev, int type,
     84                                            size_t size);
     85#ifdef TARGET_OS2
     86int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab);
     87void *snd_malloc_sgbuf_pages(struct device *device,
     88                             size_t size, struct snd_dma_buffer *dmab,
     89                             size_t *res_size);
     90
     91#endif
    8292#endif /* __SOUND_MEMALLOC_H */
    8393

  • GPL/trunk/alsa-kernel/include/sound/pcm.h

    r703 r717  
    399399        struct fasync_struct *fasync;
    400400        bool stop_operating;            /* sync_stop will be called */
     401        struct mutex buffer_mutex;      /* protect for buffer changes */
     402        atomic_t buffer_accessing;      /* >0: in r/w operation, <0: blocked */
    401403
    402404        /* -- private section -- */
    … …  
    12251227int snd_pcm_lib_free_pages(struct snd_pcm_substream *substream);
    12261228
    1227 void snd_pcm_set_managed_buffer(struct snd_pcm_substream *substream, int type,
    1228                                 struct device *data, size_t size, size_t max);
    1229 void snd_pcm_set_managed_buffer_all(struct snd_pcm *pcm, int type,
    1230                                     struct device *data,
    1231                                     size_t size, size_t max);
     1229int snd_pcm_set_managed_buffer(struct snd_pcm_substream *substream, int type,
     1230                               struct device *data, size_t size, size_t max);
     1231int snd_pcm_set_managed_buffer_all(struct snd_pcm *pcm, int type,
     1232                                   struct device *data,
     1233                                   size_t size, size_t max);
     1234
     1235/**
     1236 * snd_pcm_set_fixed_buffer - Preallocate and set up the fixed size PCM buffer
     1237 * @substream: the pcm substream instance
     1238 * @type: DMA type (SNDRV_DMA_TYPE_*)
     1239 * @data: DMA type dependent data
     1240 * @size: the requested pre-allocation size in bytes
     1241 *
     1242 * This is a variant of snd_pcm_set_managed_buffer(), but this pre-allocates
     1243 * only the given sized buffer and doesn't allow re-allocation nor dynamic
     1244 * allocation of a larger buffer unlike the standard one.
     1245 * The function may return -ENOMEM error, hence the caller must check it.
     1246 */
     1247static inline int __must_check
     1248snd_pcm_set_fixed_buffer(struct snd_pcm_substream *substream, int type,
     1249                                 struct device *data, size_t size)
     1250{
     1251        return snd_pcm_set_managed_buffer(substream, type, data, size, 0);
     1252}
     1253
     1254/**
     1255 * snd_pcm_set_fixed_buffer_all - Preallocate and set up the fixed size PCM buffer
     1256 * @pcm: the pcm instance
     1257 * @type: DMA type (SNDRV_DMA_TYPE_*)
     1258 * @data: DMA type dependent data
     1259 * @size: the requested pre-allocation size in bytes
     1260 *
     1261 * Apply the set up of the fixed buffer via snd_pcm_set_fixed_buffer() for
     1262 * all substream.  If any of allocation fails, it returns -ENOMEM, hence the
     1263 * caller must check the return value.
     1264 */
     1265static inline int __must_check
     1266snd_pcm_set_fixed_buffer_all(struct snd_pcm *pcm, int type,
     1267                             struct device *data, size_t size)
     1268{
     1269        return snd_pcm_set_managed_buffer_all(pcm, type, data, size, 0);
     1270}
    12321271
    12331272int _snd_pcm_lib_alloc_vmalloc_buffer(struct snd_pcm_substream *substream,

  • GPL/trunk/alsa-kernel/include/sound/pxa2xx-lib.h

    r679 r717  
    1515extern int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
    1616                                struct snd_pcm_hw_params *params);
    17 extern int pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream);
    1817extern int pxa2xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd);
    1918extern snd_pcm_uframes_t pxa2xx_pcm_pointer(struct snd_pcm_substream *substream);
    … …  
    2120extern int pxa2xx_pcm_open(struct snd_pcm_substream *substream);
    2221extern int pxa2xx_pcm_close(struct snd_pcm_substream *substream);
    23 extern int pxa2xx_pcm_mmap(struct snd_pcm_substream *substream,
    24         struct vm_area_struct *vma);
    25 extern int pxa2xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream);
    26 extern void pxa2xx_pcm_free_dma_buffers(struct snd_pcm *pcm);
    27 extern void pxa2xx_soc_pcm_free(struct snd_soc_component *component,
    28                                 struct snd_pcm *pcm);
     22extern int pxa2xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm);
    2923extern int pxa2xx_soc_pcm_new(struct snd_soc_component *component,
    3024                              struct snd_soc_pcm_runtime *rtd);
    … …  
    3630                                    struct snd_pcm_substream *substream,
    3731                                    struct snd_pcm_hw_params *params);
    38 extern int pxa2xx_soc_pcm_hw_free(struct snd_soc_component *component,
    39                                   struct snd_pcm_substream *substream);
    4032extern int pxa2xx_soc_pcm_prepare(struct snd_soc_component *component,
    4133                                  struct snd_pcm_substream *substream);
    … …  
    4537pxa2xx_soc_pcm_pointer(struct snd_soc_component *component,
    4638                       struct snd_pcm_substream *substream);
    47 extern int pxa2xx_soc_pcm_mmap(struct snd_soc_component *component,
    48                                struct snd_pcm_substream *substream,
    49                                struct vm_area_struct *vma);
    5039
    5140/* AC97 */

  • GPL/trunk/alsa-kernel/include/sound/rawmidi.h

    r703 r717  
    9999        struct snd_rawmidi_substream *input;
    100100        struct snd_rawmidi_substream *output;
     101        unsigned int user_pversion;     /* supported protocol version */
    101102};
    102103

  • GPL/trunk/alsa-kernel/include/sound/soc-topology.h

    r703 r717  
    189189#else
    190190
    191 static inline int snd_soc_tplg_component_remove(struct snd_soc_component *comp,
    192                                                 u32 index)
     191static inline int snd_soc_tplg_component_remove(struct snd_soc_component *comp)
    193192{
    194193        return 0;

  • GPL/trunk/alsa-kernel/include/sound/sof.h

    r695 r717  
    102102
    103103int sof_dai_get_mclk(struct snd_soc_pcm_runtime *rtd);
     104int sof_dai_get_bclk(struct snd_soc_pcm_runtime *rtd);
    104105
    105106#endif

  • GPL/trunk/alsa-kernel/include/sound/version.h

    r703 r717  
    11/* include/version.h */
    2 #define CONFIG_SND_VERSION "5.14.7"
     2#define CONFIG_SND_VERSION "5.15.59"
    33#define CONFIG_SND_DATE ""
Note: See TracChangeset for help on using the changeset viewer.