Changeset 696

Timestamp:

Sep 8, 2021, 11:26:35 AM (4 years ago)

Author:

Paul Smedley

Message:

Update linux source to 5.13.15 code level

Location:

GPL/branches/uniaud32-next/alsa-kernel

Files:

• core/pcm_lib.c (modified) (1 diff)
• core/pcm_native.c (modified) (1 diff)
• pci/hda/hda_generic.c (modified) (2 diffs)
• pci/hda/patch_realtek.c (modified) (7 diffs)
• pci/hda/patch_via.c (modified) (1 diff)

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

@@ -1780 +1780 @@
                 frame_size = snd_pcm_format_size(format, channels);
                 if (frame_size > 0)
-                        params->fifo_size /= (unsigned)frame_size;
+                        params->fifo_size /= frame_size;
         }
         return 0;

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

@@ -256 +256 @@
         switch (substream->dma_buffer.dev.type) {
         case SNDRV_DMA_TYPE_UNKNOWN:
-                return false;
+                /* we can't know the device, so just assume that the driver does
+                 * everything right
+                 */
+                return true;
         case SNDRV_DMA_TYPE_CONTINUOUS:
         case SNDRV_DMA_TYPE_VMALLOC:

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

@@ -3472 +3472 @@
         const struct hda_input_mux *imux;
         struct nid_path *path;
-        int i, adc_idx, err = 0;
+        int i, adc_idx, ret, err = 0;
 
         imux = &spec->input_mux;
@@ -3482 +3482 @@
                         continue;
                 kcontrol->private_value = path->ctls[type];
-                err = func(kcontrol, ucontrol);
-                if (err < 0)
+                ret = func(kcontrol, ucontrol);
+                if (ret < 0) {
+                        err = ret;
                         break;
+                }
+                if (ret > 0)
+                        err = 1;
         }
         mutex_unlock(&codec->control_mutex);

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

@@ -7289 +7289 @@
         ALC623_FIXUP_LENOVO_THINKSTATION_P340,
         ALC255_FIXUP_ACER_HEADPHONE_AND_MIC,
+        ALC236_FIXUP_HP_LIMIT_INT_MIC_BOOST,
 };
 
@@ -9184 +9185 @@
         },
 #endif
+        [ALC236_FIXUP_HP_LIMIT_INT_MIC_BOOST] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc269_fixup_limit_int_mic_boost,
+                .chained = true,
+                .chain_id = ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF,
+        },
 };
 
@@ -9274 +9281 @@
         SND_PCI_QUIRK(0x1028, 0x0a30, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC),
         SND_PCI_QUIRK(0x1028, 0x0a58, "Dell", ALC255_FIXUP_DELL_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1028, 0x0a61, "Dell XPS 15 9510", ALC289_FIXUP_DUAL_SPK),
         SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
@@ -9372 +9380 @@
         SND_PCI_QUIRK(0x103c, 0x87f4, "HP", ALC287_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x87f5, "HP", ALC287_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x87f6, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),
         SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),
+        SND_PCI_QUIRK(0x103c, 0x8805, "HP ProBook 650 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x880d, "HP EliteBook 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x8846, "HP EliteBook 850 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
@@ -9378 +9388 @@
         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, 0x8862, "HP ProBook 445 G8 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
-        SND_PCI_QUIRK(0x103c, 0x8863, "HP ProBook 445 G8 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8862, "HP ProBook 445 G8 Notebook PC", ALC236_FIXUP_HP_LIMIT_INT_MIC_BOOST),
+        SND_PCI_QUIRK(0x103c, 0x8863, "HP ProBook 445 G8 Notebook PC", ALC236_FIXUP_HP_LIMIT_INT_MIC_BOOST),
         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),
@@ -9407 +9417 @@
         SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS),
         SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK),
+        SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK),
         SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS),
         SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC),
@@ -10452 +10463 @@
         snd_hda_pick_fixup(codec, alc269_fixup_models,
                        alc269_fixup_tbl, alc269_fixups);
+        /* FIXME: both TX300 and ROG Strix G17 have the same SSID, and
+         * the quirk breaks the latter (bko#214101).
+         * Clear the wrong entry.
+         */
+        if (codec->fixup_id == ALC282_FIXUP_ASUS_TX300 &&
+            codec->core.vendor_id == 0x10ec0294) {
+                codec_dbg(codec, "Clear wrong fixup for ASUS ROG Strix G17\n");
+                codec->fixup_id = HDA_FIXUP_ID_NOT_SET;
+        }
+
         snd_hda_pick_pin_fixup(codec, alc269_pin_fixup_tbl, alc269_fixups, true);
         snd_hda_pick_pin_fixup(codec, alc269_fallback_pin_fixup_tbl, alc269_fixups, false);

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

@@ -1063 +1063 @@
 
 static const struct snd_pci_quirk vt2002p_fixups[] = {
+        SND_PCI_QUIRK(0x1043, 0x13f7, "Asus B23E", VIA_FIXUP_POWER_SAVE),
         SND_PCI_QUIRK(0x1043, 0x1487, "Asus G75", VIA_FIXUP_ASUS_G75),
         SND_PCI_QUIRK(0x1043, 0x8532, "Asus X202E", VIA_FIXUP_INTMIC_BOOST),