Changeset 691

Timestamp:

Aug 7, 2021, 12:08:58 AM (4 years ago)

Author:

Paul Smedley

Message:

Update linux sound code to 5.10.56

Location:

GPL/branches/uniaud32-next/alsa-kernel

Files:

• core/pcm_native.c (modified) (2 diffs)
• include/sound/version.h (modified) (1 diff)
• isa/cmi8330.c (modified) (1 diff)
• isa/sb/sb16_csp.c (modified) (5 diffs)
• pci/hda/hda_tegra.c (modified) (1 diff)
• pci/hda/patch_hdmi.c (modified) (1 diff)
• pci/hda/patch_realtek.c (modified) (1 diff)

GPL/branches/uniaud32-next/alsa-kernel/core/pcm_native.c

@@ -251 +251 @@
                 return false;
 
-        if (substream->ops->mmap ||
-            (substream->dma_buffer.dev.type != SNDRV_DMA_TYPE_DEV &&
-             substream->dma_buffer.dev.type != SNDRV_DMA_TYPE_DEV_UC))
+        if (substream->ops->mmap)
                 return true;
 
-        return dma_can_mmap(substream->dma_buffer.dev.dev);
+        switch (substream->dma_buffer.dev.type) {
+        case SNDRV_DMA_TYPE_UNKNOWN:
+                return false;
+        case SNDRV_DMA_TYPE_CONTINUOUS:
+        case SNDRV_DMA_TYPE_VMALLOC:
+                return true;
+        default:
+                return dma_can_mmap(substream->dma_buffer.dev.dev);
+        }
 }
 
@@ -3106 +3112 @@
         snd_pcm_stream_lock_irq(substream);
         /* FIXME: we should consider the boundary for the sync from app */
-        if (!(sflags & SNDRV_PCM_SYNC_PTR_APPL))
-                control->appl_ptr = scontrol.appl_ptr;
-        else
+        if (!(sflags & SNDRV_PCM_SYNC_PTR_APPL)) {
+                err = pcm_lib_apply_appl_ptr(substream,
+                                scontrol.appl_ptr);
+                if (err < 0) {
+                        snd_pcm_stream_unlock_irq(substream);
+                        return err;
+                }
+        } else
                 scontrol.appl_ptr = control->appl_ptr % boundary;
         if (!(sflags & SNDRV_PCM_SYNC_PTR_AVAIL_MIN))

GPL/branches/uniaud32-next/alsa-kernel/include/sound/version.h

@@ -1 +1 @@
 /* include/version.h */
-#define CONFIG_SND_VERSION "5.10.50"
+#define CONFIG_SND_VERSION "5.10.56"
 #define CONFIG_SND_DATE ""

GPL/branches/uniaud32-next/alsa-kernel/isa/cmi8330.c

@@ -549 +549 @@
         if (acard->sb->hardware != SB_HW_16) {
                 snd_printk(KERN_ERR PFX "SB16 not found during probe\n");
-                return err;
+                return -ENODEV;
         }
 

GPL/branches/uniaud32-next/alsa-kernel/isa/sb/sb16_csp.c

@@ -816 +816 @@
         snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV, mixL & 0x7);
         snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV + 1, mixR & 0x7);
+        spin_unlock_irqrestore(&p->chip->mixer_lock, flags);
 
         spin_lock(&p->chip->reg_lock);
@@ -855 +856 @@
 
         /* restore PCM volume */
+        spin_lock_irqsave(&p->chip->mixer_lock, flags);
         snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV, mixL);
         snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV + 1, mixR);
@@ -880 +882 @@
         snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV, mixL & 0x7);
         snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV + 1, mixR & 0x7);
+        spin_unlock_irqrestore(&p->chip->mixer_lock, flags);
 
         spin_lock(&p->chip->reg_lock);
@@ -894 +897 @@
 
         /* restore PCM volume */
+        spin_lock_irqsave(&p->chip->mixer_lock, flags);
         snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV, mixL);
         snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV + 1, mixR);
@@ -1074 +1078 @@
         
         down_write(&card->controls_rwsem);
-        if (p->qsound_switch)
+        if (p->qsound_switch) {
                 snd_ctl_remove(card, p->qsound_switch);
-        if (p->qsound_space)
+                p->qsound_switch = NULL;
+        }
+        if (p->qsound_space) {
                 snd_ctl_remove(card, p->qsound_space);
+                p->qsound_space = NULL;
+        }
         up_write(&card->controls_rwsem);
 

GPL/branches/uniaud32-next/alsa-kernel/pci/hda/hda_tegra.c

@@ -303 +303 @@
         struct device_node *np = pdev->dev.of_node;
 
+        if (irq_id < 0)
+                return irq_id;
+
         err = hda_tegra_init_chip(chip, pdev);
         if (err)

GPL/branches/uniaud32-next/alsa-kernel/pci/hda/patch_hdmi.c

@@ -1947 +1947 @@
         SND_PCI_QUIRK(0x103c, 0x870f, "HP", 1),
         SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1),
+        SND_PCI_QUIRK(0x1462, 0xec94, "MS-7C94", 1),
         {}
 };

GPL/branches/uniaud32-next/alsa-kernel/pci/hda/patch_realtek.c

@@ -9552 +9552 @@
         SND_PCI_QUIRK(0x17aa, 0x3176, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC),
         SND_PCI_QUIRK(0x17aa, 0x3178, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC),
+        SND_PCI_QUIRK(0x17aa, 0x31af, "ThinkCentre Station", ALC623_FIXUP_LENOVO_THINKSTATION_P340),
         SND_PCI_QUIRK(0x17aa, 0x3818, "Lenovo C940", ALC298_FIXUP_LENOVO_SPK_VOLUME),
         SND_PCI_QUIRK(0x17aa, 0x3827, "Ideapad S740", ALC285_FIXUP_IDEAPAD_S740_COEF),