Changeset 686

Timestamp:

Jun 19, 2021, 12:52:23 AM (4 years ago)

Author:

Paul Smedley

Message:

Update linux sound source to 5.10.45 kernel level

Location:

GPL/branches/uniaud32-next

Files:

• alsa-kernel/core/seq/seq_timer.c (modified) (1 diff)
• alsa-kernel/core/timer.c (modified) (1 diff)
• alsa-kernel/isa/gus/gus_main.c (modified) (1 diff)
• alsa-kernel/isa/sb/sb16_main.c (modified) (1 diff)
• alsa-kernel/pci/hda/hda_codec.c (modified) (2 diffs)
• alsa-kernel/pci/hda/patch_realtek.c (modified) (11 diffs)
• include/linux/pm.h (modified) (3 diffs)

GPL/branches/uniaud32-next/alsa-kernel/core/seq/seq_timer.c

@@ -298 +298 @@
         }
         spin_lock_irq(&tmr->lock);
-        tmr->timeri = t;
+        if (tmr->timeri)
+                err = -EBUSY;
+        else
+                tmr->timeri = t;
         spin_unlock_irq(&tmr->lock);
+        if (err < 0) {
+                snd_timer_close(t);
+                snd_timer_instance_free(t);
+                return err;
+        }
         return 0;
 }

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

@@ -522 +522 @@
         if (timer->hw.flags & SNDRV_TIMER_HW_SLAVE)
                 return;
+        event += 10; /* convert to SNDRV_TIMER_EVENT_MXXX */
         list_for_each_entry(ts, &ti->slave_active_head, active_list, struct snd_timer_instance)
                 if (ts->ccallback)
-                        ts->ccallback(ts, event + 100, &tstamp, resolution);
+                        ts->ccallback(ts, event, &tstamp, resolution);
 }
 

GPL/branches/uniaud32-next/alsa-kernel/isa/gus/gus_main.c

@@ -78 +78 @@
 static void snd_gus_init_control(struct snd_gus_card *gus)
 {
-        int ret;
-
-        if (!gus->ace_flag) {
-                ret =
-                        snd_ctl_add(gus->card,
-                                        snd_ctl_new1(&snd_gus_joystick_control,
-                                                gus));
-                if (ret)
-                        snd_printk(KERN_ERR "gus: snd_ctl_add failed: %d\n",
-                                        ret);
-        }
+        if (!gus->ace_flag)
+                snd_ctl_add(gus->card, snd_ctl_new1(&snd_gus_joystick_control, gus));
 }
 

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

@@ -847 +847 @@
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_sb16_capture_ops);
 
-        if (chip->dma16 >= 0 && chip->dma8 != chip->dma16) {
-                err = snd_ctl_add(card, snd_ctl_new1(
-                                        &snd_sb16_dma_control, chip));
-                if (err)
-                        return err;
-        } else {
+        if (chip->dma16 >= 0 && chip->dma8 != chip->dma16)
+                snd_ctl_add(card, snd_ctl_new1(&snd_sb16_dma_control, chip));
+        else
                 pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;
-        }
 
         snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,

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

@@ -2989 +2989 @@
 static int hda_codec_pm_prepare(struct device *dev)
 {
+        dev->power.power_state = PMSG_SUSPEND;
         return pm_runtime_suspended(dev);
 }
@@ -2996 +2997 @@
         struct hda_codec *codec = dev_to_hda_codec(dev);
 
+#ifndef TARGET_OS2
+        /* If no other pm-functions are called between prepare() and complete() */
+        if (dev->power.power_state.event == PM_EVENT_SUSPEND)
+                dev->power.power_state = PMSG_RESUME;
+#endif
         if (pm_runtime_suspended(dev) && (codec->jackpoll_interval ||
             hda_codec_need_resume(codec) || codec->forced_resume))

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

@@ -3152 +3152 @@
 };
 
+static const struct snd_hda_pin_quirk alc882_pin_fixup_tbl[] = {
+#ifndef TARGET_OS2
+        SND_HDA_PIN_QUIRK(0x10ec1220, 0x1043, "ASUS", ALC1220_FIXUP_CLEVO_P950,
+                {0x14, 0x01014010},
+                {0x15, 0x01011012},
+                {0x16, 0x01016011},
+                {0x18, 0x01a19040},
+                {0x19, 0x02a19050},
+                {0x1a, 0x0181304f},
+                {0x1b, 0x0221401f},
+                {0x1e, 0x01456130}),
+        SND_HDA_PIN_QUIRK(0x10ec1220, 0x1462, "MS-7C35", ALC1220_FIXUP_CLEVO_P950,
+                {0x14, 0x01015010},
+                {0x15, 0x01011012},
+                {0x16, 0x01011011},
+                {0x18, 0x01a11040},
+                {0x19, 0x02a19050},
+                {0x1a, 0x0181104f},
+                {0x1b, 0x0221401f},
+                {0x1e, 0x01451130}),
+#endif
+        {0}
+};
+
 /*
  * BIOS auto configuration
@@ -3193 +3217 @@
         snd_hda_pick_fixup(codec, alc882_fixup_models, alc882_fixup_tbl,
                        alc882_fixups);
+        snd_hda_pick_pin_fixup(codec, alc882_pin_fixup_tbl, alc882_fixups, true);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
 
@@ -7224 +7249 @@
         ALC295_FIXUP_HP_OMEN,
         ALC285_FIXUP_HP_SPECTRE_X360,
+        ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP,
+        ALC623_FIXUP_LENOVO_THINKSTATION_P340,
+        ALC255_FIXUP_ACER_HEADPHONE_AND_MIC,
 };
 
@@ -9091 +9119 @@
                 .chained = true,
                 .chain_id = ALC285_FIXUP_SPEAKER2_TO_DAC1,
+        },
+#endif
+        [ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc285_fixup_ideapad_s740_coef,
+                .chained = true,
+                .chain_id = ALC285_FIXUP_THINKPAD_HEADSET_JACK,
+        },
+        [ALC623_FIXUP_LENOVO_THINKSTATION_P340] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc_fixup_no_shutup,
+                .chained = true,
+                .chain_id = ALC283_FIXUP_HEADSET_MIC,
+        },
+#ifdef TARGET_OS2xxx
+        [ALC255_FIXUP_ACER_HEADPHONE_AND_MIC] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x21, 0x03211030 }, /* Change the Headphone location to Left */
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC255_FIXUP_XIAOMI_HEADSET_MIC
         },
 #endif
@@ -9129 +9180 @@
         SND_PCI_QUIRK(0x1025, 0x1330, "Acer TravelMate X514-51T", ALC255_FIXUP_ACER_HEADSET_MIC),
         SND_PCI_QUIRK(0x1025, 0x1430, "Acer TravelMate B311R-31", ALC256_FIXUP_ACER_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1025, 0x1466, "Acer Aspire A515-56", ALC255_FIXUP_ACER_HEADPHONE_AND_MIC),
         SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
         SND_PCI_QUIRK(0x1028, 0x054b, "Dell XPS one 2710", ALC275_FIXUP_DELL_XPS),
@@ -9250 +9302 @@
         SND_PCI_QUIRK(0x103c, 0x82c0, "HP G3 mini premium", ALC221_FIXUP_HP_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x103c, 0x83b9, "HP Spectre x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),
+        SND_PCI_QUIRK(0x103c, 0x841c, "HP Pavilion 15-CK0xx", ALC269_FIXUP_HP_MUTE_LED_MIC3),
         SND_PCI_QUIRK(0x103c, 0x8497, "HP Envy x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),
         SND_PCI_QUIRK(0x103c, 0x84da, "HP OMEN dc0019-ur", ALC295_FIXUP_HP_OMEN),
@@ -9256 +9309 @@
         SND_PCI_QUIRK(0x103c, 0x869d, "HP", ALC236_FIXUP_HP_MUTE_LED),
         SND_PCI_QUIRK(0x103c, 0x86c7, "HP Envy AiO 32", ALC274_FIXUP_HP_ENVY_GPIO),
+        SND_PCI_QUIRK(0x103c, 0x8716, "HP Elite Dragonfly G2 Notebook PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
+        SND_PCI_QUIRK(0x103c, 0x8720, "HP EliteBook x360 1040 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
         SND_PCI_QUIRK(0x103c, 0x8724, "HP EliteBook 850 G7", ALC285_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x8729, "HP", ALC285_FIXUP_HP_GPIO_LED),
@@ -9274 +9329 @@
         SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),
         SND_PCI_QUIRK(0x103c, 0x8846, "HP EliteBook 850 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x884b, "HP EliteBook 840 Aero G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x884c, "HP EliteBook 840 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x886d, "HP ZBook Fury 17.3 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
+        SND_PCI_QUIRK(0x103c, 0x8870, "HP ZBook Fury 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
+        SND_PCI_QUIRK(0x103c, 0x8873, "HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
+        SND_PCI_QUIRK(0x103c, 0x888d, "HP ZBook Power 15.6 inch G8 Mobile Workstation PC", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED),
         SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),
         SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),
@@ -9410 +9471 @@
         SND_PCI_QUIRK(0x1558, 0xc022, "Clevo NH77[DC][QW]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC233_FIXUP_LENOVO_MULTI_CODECS),
-        SND_PCI_QUIRK(0x17aa, 0x1048, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC),
+        SND_PCI_QUIRK(0x17aa, 0x1048, "ThinkCentre Station", ALC623_FIXUP_LENOVO_THINKSTATION_P340),
         SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),
         SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),
@@ -9460 +9521 @@
         SND_PCI_QUIRK(0x17aa, 0x3818, "Lenovo C940", ALC298_FIXUP_LENOVO_SPK_VOLUME),
         SND_PCI_QUIRK(0x17aa, 0x3827, "Ideapad S740", ALC285_FIXUP_IDEAPAD_S740_COEF),
+        SND_PCI_QUIRK(0x17aa, 0x3843, "Yoga 9i", ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP),
         SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
         SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),
@@ -9675 +9737 @@
         {.id = ALC295_FIXUP_HP_OMEN, .name = "alc295-hp-omen"},
         {.id = ALC285_FIXUP_HP_SPECTRE_X360, .name = "alc285-hp-spectre-x360"},
+        {.id = ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP, .name = "alc287-ideapad-bass-spk-amp"},
+        {.id = ALC623_FIXUP_LENOVO_THINKSTATION_P340, .name = "alc623-lenovo-thinkstation-p340"},
+        {.id = ALC255_FIXUP_ACER_HEADPHONE_AND_MIC, .name = "alc255-acer-headphone-and-mic"},
         {0}
 };

GPL/branches/uniaud32-next/include/linux/pm.h

@@ -33 +33 @@
 };
 
+typedef struct pm_message {
+        int event;
+} pm_message_t;
+
 /*
  * Power management requests
@@ -250 +254 @@
 extern void device_power_up(void);
 extern void device_resume(void);
-
-
-typedef struct pm_message {
-        int event;
-} pm_message_t;
-
-#define PMSG_FREEZE     3
-#define PMSG_SUSPEND    3
-#define PMSG_ON         0
-#define PMSG_RESUME     0
-#define PMSG_THAW       0
-#define PMSG_RESTORE    0
-
 
 struct dev_pm_ops {
@@ -322 +313 @@
 };
 
+#define PM_EVENT_INVALID        (-1)
 #define PM_EVENT_ON             0x0000
+#define PM_EVENT_FREEZE         0x0001
+#define PM_EVENT_SUSPEND        0x0002
+#define PM_EVENT_HIBERNATE      0x0004
+#define PM_EVENT_QUIESCE        0x0008
+#define PM_EVENT_RESUME         0x0010
+#define PM_EVENT_THAW           0x0020
 #define PM_EVENT_RESTORE        0x0040
+#define PM_EVENT_RECOVER        0x0080
+#define PM_EVENT_USER           0x0100
+#define PM_EVENT_REMOTE         0x0200
+#define PM_EVENT_AUTO           0x0400
+
+#define PM_EVENT_SLEEP          (PM_EVENT_SUSPEND | PM_EVENT_HIBERNATE)
+#define PM_EVENT_USER_SUSPEND   (PM_EVENT_USER | PM_EVENT_SUSPEND)
+#define PM_EVENT_USER_RESUME    (PM_EVENT_USER | PM_EVENT_RESUME)
+#define PM_EVENT_REMOTE_RESUME  (PM_EVENT_REMOTE | PM_EVENT_RESUME)
+#define PM_EVENT_AUTO_SUSPEND   (PM_EVENT_AUTO | PM_EVENT_SUSPEND)
+#define PM_EVENT_AUTO_RESUME    (PM_EVENT_AUTO | PM_EVENT_RESUME)
+
+#define PMSG_FREEZE     3
+#define PMSG_SUSPEND    3
+#define PMSG_ON         0
+#define PMSG_RESUME     0
+#define PMSG_THAW       0
+#define PMSG_RESTORE    0
 
 #endif /* _LINUX_PM_H */