Changeset 754

Timestamp:

Oct 22, 2022, 10:06:27 AM (3 years ago)

Author:

Paul Smedley

Message:

Update linux source to 6.0.3

Location:

GPL/branches/uniaud32-exp/alsa-kernel

Files:

• core/rawmidi.c (modified) (1 diff)
• core/sound_oss.c (modified) (2 diffs)
• include/sound/version.h (modified) (1 diff)
• pci/hda/hda_beep.h (modified) (1 diff)
• pci/hda/hda_codec.c (modified) (2 diffs)
• pci/hda/patch_hdmi.c (modified) (14 diffs)
• pci/hda/patch_realtek.c (modified) (4 diffs)
• pci/hda/patch_sigmatel.c (modified) (3 diffs)

GPL/branches/uniaud32-exp/alsa-kernel/core/rawmidi.c

@@ -1929 +1929 @@
         snd_info_free_entry(rmidi->proc_entry);
         rmidi->proc_entry = NULL;
-        mutex_lock(&register_mutex);
         if (rmidi->ops && rmidi->ops->dev_unregister)
                 rmidi->ops->dev_unregister(rmidi);
-        mutex_unlock(&register_mutex);
 
         snd_rawmidi_free_substreams(&rmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT]);

GPL/branches/uniaud32-exp/alsa-kernel/core/sound_oss.c

@@ -171 +171 @@
                 return -ENOENT;
         }
-        unregister_sound_special(minor);
         switch (SNDRV_MINOR_OSS_DEVICE(minor)) {
         case SNDRV_MINOR_OSS_PCM:
@@ -183 +182 @@
                 break;
         }
-        if (track2 >= 0) {
+        if (track2 >= 0)
+                snd_oss_minors[track2] = NULL;
+        snd_oss_minors[minor] = NULL;
+        mutex_unlock(&sound_oss_mutex);
+
+        /* call unregister_sound_special() outside sound_oss_mutex;
+         * otherwise may deadlock, as it can trigger the release of a card
+         */
+        unregister_sound_special(minor);
+        if (track2 >= 0)
                 unregister_sound_special(track2);
-                snd_oss_minors[track2] = NULL;
-        }
-        snd_oss_minors[minor] = NULL;
-        mutex_unlock(&sound_oss_mutex);
+
         kfree(mptr);
         return 0;

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

@@ -1 +1 @@
 /* include/version.h */
-#define CONFIG_SND_VERSION "6.0.2"
+#define CONFIG_SND_VERSION "6.0.3"
 #define CONFIG_SND_DATE ""

GPL/branches/uniaud32-exp/alsa-kernel/pci/hda/hda_beep.h

@@ -26 +26 @@
         unsigned int linear_tone:1;     /* linear tone for IDT/STAC codec */
         unsigned int playing:1;
+        unsigned int keep_power_at_enable:1;    /* set by driver */
         struct work_struct beep_work; /* scheduled task for beep event */
         struct mutex mutex;

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

@@ -944 +944 @@
 
         codec->bus = bus;
-        codec->core.type = HDA_DEV_LEGACY;
-
-        return codec;
-}
-EXPORT_SYMBOL_GPL(snd_hda_codec_device_init);
-
-/**
- * snd_hda_codec_new - create a HDA codec
- * @bus: the bus to assign
- * @card: card for this codec
- * @codec_addr: the codec address
- * @codecp: the pointer to store the generated codec
- *
- * Returns 0 if successful, or a negative error code.
- */
-int snd_hda_codec_new(struct hda_bus *bus, struct snd_card *card,
-                      unsigned int codec_addr, struct hda_codec **codecp)
-{
-        struct hda_codec *codec;
-        int ret;
-
-        codec = snd_hda_codec_device_init(bus, codec_addr, "hdaudioC%dD%d",
-                                          card->number, codec_addr);
-        if (IS_ERR(codec))
-                return PTR_ERR(codec);
-        *codecp = codec;
-
-        ret = snd_hda_codec_device_new(bus, card, codec_addr, *codecp, true);
-        if (ret)
-                put_device(hda_codec_dev(*codecp));
-
-        return ret;
-}
-EXPORT_SYMBOL_GPL(snd_hda_codec_new);
-
-int snd_hda_codec_device_new(struct hda_bus *bus, struct snd_card *card,
-                        unsigned int codec_addr, struct hda_codec *codec,
-                        bool snddev_managed)
-{
-        char component[31];
-        hda_nid_t fg;
-        int err;
-        static const struct snd_device_ops dev_ops = {
-                .dev_register = snd_hda_codec_dev_register,
-                .dev_free = snd_hda_codec_dev_free,
-        };
-
-        dev_dbg(card->dev, "%s: entry\n", __func__);
-
-        if (snd_BUG_ON(!bus))
-                return -EINVAL;
-        if (snd_BUG_ON(codec_addr > HDA_MAX_CODEC_ADDRESS))
-                return -EINVAL;
-
+        codec->depop_delay = -1;
+        codec->fixup_id = HDA_FIXUP_ID_NOT_SET;
         codec->core.dev.release = snd_hda_codec_dev_release;
         codec->core.exec_verb = codec_exec_verb;
-
-        codec->card = card;
-        codec->addr = codec_addr;
+        codec->core.type = HDA_DEV_LEGACY;
+
         mutex_init(&codec->spdif_mutex);
         mutex_init(&codec->control_mutex);
@@ -1015 +962 @@
         INIT_LIST_HEAD(&codec->conn_list);
         INIT_LIST_HEAD(&codec->pcm_list_head);
+        INIT_DELAYED_WORK(&codec->jackpoll_work, hda_jackpoll_work);
         refcount_set(&codec->pcm_ref, 1);
         init_waitqueue_head(&codec->remove_sleep);
 
-        INIT_DELAYED_WORK(&codec->jackpoll_work, hda_jackpoll_work);
-        codec->depop_delay = -1;
-        codec->fixup_id = HDA_FIXUP_ID_NOT_SET;
+        return codec;
+}
+EXPORT_SYMBOL_GPL(snd_hda_codec_device_init);
+
+/**
+ * snd_hda_codec_new - create a HDA codec
+ * @bus: the bus to assign
+ * @card: card for this codec
+ * @codec_addr: the codec address
+ * @codecp: the pointer to store the generated codec
+ *
+ * Returns 0 if successful, or a negative error code.
+ */
+int snd_hda_codec_new(struct hda_bus *bus, struct snd_card *card,
+                      unsigned int codec_addr, struct hda_codec **codecp)
+{
+        struct hda_codec *codec;
+        int ret;
+
+        codec = snd_hda_codec_device_init(bus, codec_addr, "hdaudioC%dD%d",
+                                          card->number, codec_addr);
+        if (IS_ERR(codec))
+                return PTR_ERR(codec);
+        *codecp = codec;
+
+        ret = snd_hda_codec_device_new(bus, card, codec_addr, *codecp, true);
+        if (ret)
+                put_device(hda_codec_dev(*codecp));
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_hda_codec_new);
+
+int snd_hda_codec_device_new(struct hda_bus *bus, struct snd_card *card,
+                        unsigned int codec_addr, struct hda_codec *codec,
+                        bool snddev_managed)
+{
+        char component[31];
+        hda_nid_t fg;
+        int err;
+        static const struct snd_device_ops dev_ops = {
+                .dev_register = snd_hda_codec_dev_register,
+                .dev_free = snd_hda_codec_dev_free,
+        };
+
+        dev_dbg(card->dev, "%s: entry\n", __func__);
+
+        if (snd_BUG_ON(!bus))
+                return -EINVAL;
+        if (snd_BUG_ON(codec_addr > HDA_MAX_CODEC_ADDRESS))
+                return -EINVAL;
+
+        codec->card = card;
+        codec->addr = codec_addr;
 
 #ifdef CONFIG_PM

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

@@ -66 +66 @@
 struct hdmi_spec_per_cvt {
         hda_nid_t cvt_nid;
-        int assigned;
+        bool assigned;          /* the stream has been assigned */
+        bool silent_stream;     /* silent stream activated */
         unsigned int channels_min;
         unsigned int channels_max;
@@ -1001 +1002 @@
  */
 static int hdmi_choose_cvt(struct hda_codec *codec,
-                           int pin_idx, int *cvt_id)
+                           int pin_idx, int *cvt_id,
+                           bool silent)
 {
         struct hdmi_spec *spec = codec->spec;
@@ -1016 +1018 @@
         if (per_pin && per_pin->silent_stream) {
                 cvt_idx = cvt_nid_to_cvt_index(codec, per_pin->cvt_nid);
+                per_cvt = get_cvt(spec, cvt_idx);
+                if (per_cvt->assigned && !silent)
+                        return -EBUSY;
                 if (cvt_id)
                         *cvt_id = cvt_idx;
@@ -1026 +1031 @@
 
                 /* Must not already be assigned */
-                if (per_cvt->assigned)
+                if (per_cvt->assigned || per_cvt->silent_stream)
                         continue;
                 if (per_pin == NULL)
@@ -1212 +1217 @@
                 return -EINVAL;
 
-        err = hdmi_choose_cvt(codec, -1, &cvt_idx);
+        err = hdmi_choose_cvt(codec, -1, &cvt_idx, false);
         if (err)
                 return err;
 
         per_cvt = get_cvt(spec, cvt_idx);
-        per_cvt->assigned = 1;
+        per_cvt->assigned = true;
         hinfo->nid = per_cvt->cvt_nid;
 
@@ -1280 +1285 @@
         }
 
-        err = hdmi_choose_cvt(codec, pin_idx, &cvt_idx);
+        err = hdmi_choose_cvt(codec, pin_idx, &cvt_idx, false);
         if (err < 0)
                 goto unlock;
@@ -1286 +1291 @@
         per_cvt = get_cvt(spec, cvt_idx);
         /* Claim converter */
-        per_cvt->assigned = 1;
+        per_cvt->assigned = true;
 
         set_bit(pcm_idx, &spec->pcm_in_use);
         per_pin = get_pin(spec, pin_idx);
         per_pin->cvt_nid = per_cvt->cvt_nid;
-        per_pin->silent_stream = false;
         hinfo->nid = per_cvt->cvt_nid;
 
@@ -1321 +1325 @@
                 if (hinfo->channels_min > hinfo->channels_max ||
                     !hinfo->rates || !hinfo->formats) {
-                        per_cvt->assigned = 0;
+                        per_cvt->assigned = false;
                         hinfo->nid = 0;
                         snd_hda_spdif_ctls_unassign(codec, pcm_idx);
@@ -1773 +1777 @@
 
         pin_idx = pin_id_to_pin_index(codec, per_pin->pin_nid, per_pin->dev_id);
-        err = hdmi_choose_cvt(codec, pin_idx, &cvt_idx);
+        err = hdmi_choose_cvt(codec, pin_idx, &cvt_idx, true);
         if (err) {
                 codec_err(codec, "hdmi: no free converter to enable silent mode\n");
@@ -1780 +1784 @@
 
         per_cvt = get_cvt(spec, cvt_idx);
-        per_cvt->assigned = 1;
+        per_cvt->silent_stream = true;
         per_pin->cvt_nid = per_cvt->cvt_nid;
         per_pin->silent_stream = true;
@@ -1840 +1844 @@
         if (cvt_idx >= 0 && cvt_idx < spec->num_cvts) {
                 per_cvt = get_cvt(spec, cvt_idx);
-                per_cvt->assigned = 0;
+                per_cvt->silent_stream = false;
         }
 
@@ -2236 +2240 @@
                 }
                 per_cvt = get_cvt(spec, cvt_idx);
-                per_cvt->assigned = 0;
+                per_cvt->assigned = false;
                 hinfo->nid = 0;
 
@@ -2762 +2766 @@
                 return;
 #endif
-        /* ditto during suspend/resume process itself */
-        if (snd_hdac_is_in_pm(&codec->core))
-                return;
 
         check_presence_and_report(codec, pin_nid, dev_id);
@@ -2950 +2951 @@
                 return;
 #endif
-        /* ditto during suspend/resume process itself */
-        if (snd_hdac_is_in_pm(&codec->core))
-                return;
 
         snd_hdac_i915_set_bclk(&codec->bus->core);

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

@@ -9452 +9452 @@
                 .type = HDA_FIXUP_PINS,
                 .v.pins = (const struct hda_pintbl[]) {
-                        { 0x14, 0x90170120 },
+                        { 0x14, 0x90170152 }, /* Speaker Surround Playback Switch */
+                        { 0x19, 0x03a19020 }, /* Mic Boost Volume */
+                        { 0x1a, 0x03a11c30 }, /* Mic Boost Volume */
+                        { 0x1e, 0x90170151 }, /* Rear jack, IN OUT EAPD Detect */
+                        { 0x21, 0x03211420 },
                         { }
                 },
-                .chained = true,
-                .chain_id = ALC294_FIXUP_ASUS_G513_PINS,
         },
         [ALC294_FIXUP_ASUS_COEF_1B] = {
@@ -10212 +10214 @@
         SND_PCI_QUIRK(0x1028, 0x0872, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC),
         SND_PCI_QUIRK(0x1028, 0x0873, "Dell Precision 3930", ALC255_FIXUP_DUMMY_LINEOUT_VERB),
-        SND_PCI_QUIRK(0x1028, 0x087d, "Dell Precision 5530", ALC289_FIXUP_DUAL_SPK),
         SND_PCI_QUIRK(0x1028, 0x08ad, "Dell WYSE AIO", ALC225_FIXUP_DELL_WYSE_AIO_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x08ae, "Dell WYSE NB", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE),
@@ -10436 +10437 @@
         SND_PCI_QUIRK(0x1043, 0x1c52, "ASUS Zephyrus G15 2022", ALC289_FIXUP_ASUS_GA401),
         SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401),
+        SND_PCI_QUIRK(0x1043, 0x1f92, "ASUS ROG Flow X16", ALC289_FIXUP_ASUS_GA401),
         SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2),
         SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),
@@ -10457 +10459 @@
         SND_PCI_QUIRK(0x10ec, 0x118c, "Medion EE4254 MD62100", ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE),
         SND_PCI_QUIRK(0x10ec, 0x1230, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
+        SND_PCI_QUIRK(0x10ec, 0x124c, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
         SND_PCI_QUIRK(0x10ec, 0x1252, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
         SND_PCI_QUIRK(0x10ec, 0x1254, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),

GPL/branches/uniaud32-exp/alsa-kernel/pci/hda/patch_sigmatel.c

@@ -4414 +4414 @@
                         /* IDT/STAC codecs have linear beep tone parameter */
                         codec->beep->linear_tone = spec->linear_tone_beep;
+                        /* keep power up while beep is enabled */
+                        codec->beep->keep_power_at_enable = 1;
                         /* if no beep switch is available, make its own one */
                         caps = query_amp_caps(codec, nid, HDA_OUTPUT);
@@ -4546 +4548 @@
         return 0;
 }
-
-static int stac_check_power_status(struct hda_codec *codec, hda_nid_t nid)
-{
-#ifdef CONFIG_SND_HDA_INPUT_BEEP
-        struct sigmatel_spec *spec = codec->spec;
-#endif
-        int ret = snd_hda_gen_check_power_status(codec, nid);
-
-#ifdef CONFIG_SND_HDA_INPUT_BEEP
-        if (nid == spec->gen.beep_nid && codec->beep) {
-                if (codec->beep->enabled != spec->beep_power_on) {
-                        spec->beep_power_on = codec->beep->enabled;
-                        if (spec->beep_power_on)
-                                snd_hda_power_up_pm(codec);
-                        else
-                                snd_hda_power_down_pm(codec);
-                }
-                ret |= spec->beep_power_on;
-        }
-#endif
-        return ret;
-}
 #else
 #define stac_suspend            NULL
@@ -4580 +4560 @@
 #ifdef CONFIG_PM
         .suspend = stac_suspend,
-        .check_power_status = stac_check_power_status,
 #endif
 };