Commit 2b90dcd5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-6.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes that have been gathered in the week.

   - Fix the missing XRUN handling in USB-audio low latency mode

   - Fix regression by the previous USB-audio hadening change

   - Clean up old SH sound driver to use the standard helpers

   - A few further fixes for MIDI 2.0 UMP handling

   - Various HD-audio and USB-audio quirks

   - Fix jack handling at PM on ASoC Intel AVS

   - Misc small fixes for ASoC SOF and Mediatek"

* tag 'sound-6.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/realtek: Fix spelling mistake "Firelfy" -> "Firefly"
  ASoC: mediatek: mt8188-mt6359: Remove hardcoded dmic codec
  ALSA: hda/realtek: fix micmute LEDs don't work on HP Laptops
  ALSA: usb-audio: Add extra PID for RME Digiface USB
  ALSA: usb-audio: Fix a DMA to stack memory bug
  ASoC: SOF: ipc3-topology: fix resource leaks in sof_ipc3_widget_setup_comp_dai()
  ALSA: hda/realtek: Add support for Samsung Galaxy Book3 360 (NP730QFG)
  ASoC: Intel: avs: da7219: Remove suspend_pre() and resume_post()
  ALSA: hda/tas2781: Fix error code tas2781_read_acpi()
  ALSA: hda/realtek: Enable mute and micmute LED on HP ProBook 430 G8
  ALSA: usb-audio: add mixer mapping for Corsair HS80
  ALSA: ump: Shut up truncated string warning
  ALSA: sh: Use standard helper for buffer accesses
  ALSA: usb-audio: Notify xrun for low-latency mode
  ALSA: hda/conexant: fix Z60MR100 startup pop issue
  ALSA: ump: Update legacy substream names upon FB info update
  ALSA: ump: Indicate the inactive group in legacy substream names
  ALSA: ump: Don't open legacy substream for an inactive group
  ALSA: seq: ump: Fix seq port updates per FB info notify
parents d9e15b25 c34e9ab9

sound/core/seq/seq_ump_client.c

+3 −3
Original line number Diff line number Diff line
@@ -257,12 +257,12 @@ static void update_port_infos(struct seq_ump_client *client) 
			continue;



		old->addr.client = client->seq_client;

		old->addr.port = i;

		old->addr.port = ump_group_to_seq_port(i);

		err = snd_seq_kernel_client_ctl(client->seq_client,

						SNDRV_SEQ_IOCTL_GET_PORT_INFO,

						old);

		if (err < 0)

			return;

			continue;

		fill_port_info(new, client, &client->ump->groups[i]);

		if (old->capability == new->capability &&

		    !strcmp(old->name, new->name))
@@ -271,7 +271,7 @@ static void update_port_infos(struct seq_ump_client *client) 
						SNDRV_SEQ_IOCTL_SET_PORT_INFO,

						new);

		if (err < 0)

			return;

			continue;

		/* notify to system port */

		snd_seq_system_client_ev_port_change(client->seq_client, i);

	}

sound/core/ump.c

+20 −6
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ static int process_legacy_output(struct snd_ump_endpoint *ump, 
				 u32 *buffer, int count);

static void process_legacy_input(struct snd_ump_endpoint *ump, const u32 *src,

				 int words);

static void update_legacy_names(struct snd_ump_endpoint *ump);

#else

static inline int process_legacy_output(struct snd_ump_endpoint *ump,

					u32 *buffer, int count)
@@ -47,6 +48,9 @@ static inline void process_legacy_input(struct snd_ump_endpoint *ump, 
					const u32 *src, int words)

{

}

static inline void update_legacy_names(struct snd_ump_endpoint *ump)

{

}

#endif



static const struct snd_rawmidi_global_ops snd_ump_rawmidi_ops = {
@@ -861,6 +865,7 @@ static int ump_handle_fb_info_msg(struct snd_ump_endpoint *ump, 
		fill_fb_info(ump, &fb->info, buf);

		if (ump->parsed) {

			snd_ump_update_group_attrs(ump);

			update_legacy_names(ump);

			seq_notify_fb_change(ump, fb);

		}

	}
@@ -893,6 +898,7 @@ static int ump_handle_fb_name_msg(struct snd_ump_endpoint *ump, 
	/* notify the FB name update to sequencer, too */

	if (ret > 0 && ump->parsed) {

		snd_ump_update_group_attrs(ump);

		update_legacy_names(ump);

		seq_notify_fb_change(ump, fb);

	}

	return ret;
@@ -1087,6 +1093,8 @@ static int snd_ump_legacy_open(struct snd_rawmidi_substream *substream) 
	guard(mutex)(&ump->open_mutex);

	if (ump->legacy_substreams[dir][group])

		return -EBUSY;

	if (!ump->groups[group].active)

		return -ENODEV;

	if (dir == SNDRV_RAWMIDI_STREAM_OUTPUT) {

		if (!ump->legacy_out_opens) {

			err = snd_rawmidi_kernel_open(&ump->core, 0,
@@ -1254,11 +1262,20 @@ static void fill_substream_names(struct snd_ump_endpoint *ump, 
		name = ump->groups[idx].name;

		if (!*name)

			name = ump->info.name;

		snprintf(s->name, sizeof(s->name), "Group %d (%.16s)",

			 idx + 1, name);

		scnprintf(s->name, sizeof(s->name), "Group %d (%.16s)%s",

			  idx + 1, name,

			  ump->groups[idx].active ? "" : " [Inactive]");

	}

}



static void update_legacy_names(struct snd_ump_endpoint *ump)

{

	struct snd_rawmidi *rmidi = ump->legacy_rmidi;



	fill_substream_names(ump, rmidi, SNDRV_RAWMIDI_STREAM_INPUT);

	fill_substream_names(ump, rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT);

}



int snd_ump_attach_legacy_rawmidi(struct snd_ump_endpoint *ump,

				  char *id, int device)

{
@@ -1295,10 +1312,7 @@ int snd_ump_attach_legacy_rawmidi(struct snd_ump_endpoint *ump, 
	rmidi->ops = &snd_ump_legacy_ops;

	rmidi->private_data = ump;

	ump->legacy_rmidi = rmidi;

	if (input)

		fill_substream_names(ump, rmidi, SNDRV_RAWMIDI_STREAM_INPUT);

	if (output)

		fill_substream_names(ump, rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT);

	update_legacy_names(ump);



	ump_dbg(ump, "Created a legacy rawmidi #%d (%s)\n", device, id);

	return 0;

sound/pci/hda/patch_conexant.c

+28 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ enum { 
	CXT_FIXUP_HP_MIC_NO_PRESENCE,

	CXT_PINCFG_SWS_JS201D,

	CXT_PINCFG_TOP_SPEAKER,

	CXT_FIXUP_HP_A_U,

};



/* for hda_fixup_thinkpad_acpi() */
@@ -774,6 +775,18 @@ static void cxt_setup_mute_led(struct hda_codec *codec, 
	}

}



static void cxt_setup_gpio_unmute(struct hda_codec *codec,

				  unsigned int gpio_mute_mask)

{

	if (gpio_mute_mask) {

		// set gpio data to 0.

		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 0);

		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_MASK, gpio_mute_mask);

		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DIRECTION, gpio_mute_mask);

		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_STICKY_MASK, 0);

	}

}



static void cxt_fixup_mute_led_gpio(struct hda_codec *codec,

				const struct hda_fixup *fix, int action)

{
@@ -788,6 +801,15 @@ static void cxt_fixup_hp_zbook_mute_led(struct hda_codec *codec, 
		cxt_setup_mute_led(codec, 0x10, 0x20);

}



static void cxt_fixup_hp_a_u(struct hda_codec *codec,

			     const struct hda_fixup *fix, int action)

{

	// Init vers in BIOS mute the spk/hp by set gpio high to avoid pop noise,

	// so need to unmute once by clearing the gpio data when runs into the system.

	if (action == HDA_FIXUP_ACT_INIT)

		cxt_setup_gpio_unmute(codec, 0x2);

}



/* ThinkPad X200 & co with cxt5051 */

static const struct hda_pintbl cxt_pincfg_lenovo_x200[] = {

	{ 0x16, 0x042140ff }, /* HP (seq# overridden) */
@@ -998,6 +1020,10 @@ static const struct hda_fixup cxt_fixups[] = { 
			{ }

		},

	},

	[CXT_FIXUP_HP_A_U] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = cxt_fixup_hp_a_u,

	},

};



static const struct hda_quirk cxt5045_fixups[] = {
@@ -1072,6 +1098,7 @@ static const struct hda_quirk cxt5066_fixups[] = { 
	SND_PCI_QUIRK(0x103c, 0x8457, "HP Z2 G4 mini", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x8458, "HP Z2 G4 mini premium", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN),

	SND_PCI_QUIRK(0x14f1, 0x0252, "MBX-Z60MR100", CXT_FIXUP_HP_A_U),

	SND_PCI_QUIRK(0x14f1, 0x0265, "SWS JS201D", CXT_PINCFG_SWS_JS201D),

	SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT_FIXUP_OLPC_XO),

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410),
@@ -1117,6 +1144,7 @@ static const struct hda_model_fixup cxt5066_fixup_models[] = { 
	{ .id = CXT_PINCFG_LENOVO_NOTEBOOK, .name = "lenovo-20149" },

	{ .id = CXT_PINCFG_SWS_JS201D, .name = "sws-js201d" },

	{ .id = CXT_PINCFG_TOP_SPEAKER, .name = "sirius-top-speaker" },

	{ .id = CXT_FIXUP_HP_A_U, .name = "HP-U-support" },

	{}

};

sound/pci/hda/patch_realtek.c

+8 −0
Original line number Diff line number Diff line
@@ -10340,6 +10340,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x87b7, "HP Laptop 14-fq0xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),

	SND_PCI_QUIRK(0x103c, 0x87c8, "HP", ALC287_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x87d3, "HP Laptop 15-gw0xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),

	SND_PCI_QUIRK(0x103c, 0x87df, "HP ProBook 430 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x87e5, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x87e7, "HP ProBook 450 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x87f1, "HP ProBook 630 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
@@ -10521,7 +10522,13 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8cdf, "HP SnowWhite", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8ce0, "HP SnowWhite", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8cf5, "HP ZBook Studio 16", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8d01, "HP ZBook Power 14 G12", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8d84, "HP EliteBook X G1i", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8d91, "HP ZBook Firefly 14 G12", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8d92, "HP ZBook Firefly 16 G12", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8e18, "HP ZBook Firefly 14 G12A", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8e19, "HP ZBook Firefly 14 G12A", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8e1a, "HP ZBook Firefly 14 G12A", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),

	SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
@@ -10676,6 +10683,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x144d, 0xc830, "Samsung Galaxy Book Ion (NT950XCJ-X716A)", ALC298_FIXUP_SAMSUNG_AMP),

	SND_PCI_QUIRK(0x144d, 0xc832, "Samsung Galaxy Book Flex Alpha (NP730QCJ)", ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),

	SND_PCI_QUIRK(0x144d, 0xca03, "Samsung Galaxy Book2 Pro 360 (NP930QED)", ALC298_FIXUP_SAMSUNG_AMP),

	SND_PCI_QUIRK(0x144d, 0xca06, "Samsung Galaxy Book3 360 (NP730QFG)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),

	SND_PCI_QUIRK(0x144d, 0xc868, "Samsung Galaxy Book2 Pro (NP930XED)", ALC298_FIXUP_SAMSUNG_AMP),

	SND_PCI_QUIRK(0x144d, 0xc870, "Samsung Galaxy Book2 Pro (NP950XED)", ALC298_FIXUP_SAMSUNG_AMP_V2_2_AMPS),

	SND_PCI_QUIRK(0x144d, 0xc872, "Samsung Galaxy Book2 Pro (NP950XEE)", ALC298_FIXUP_SAMSUNG_AMP_V2_2_AMPS),

sound/pci/hda/tas2781_hda_i2c.c

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ static int tas2781_read_acpi(struct tasdevice_priv *p, const char *hid) 
	sub = acpi_get_subsystem_id(ACPI_HANDLE(physdev));

	if (IS_ERR(sub)) {

		dev_err(p->dev, "Failed to get SUBSYS ID.\n");

		ret = PTR_ERR(sub);

		goto err;

	}

	/* Speaker id was needed for ASUS projects. */