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

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

Pull sound fixes from Takashi Iwai:
 "The majority of changes here are various fixes for Intel drivers,
  and there is a change in ASoC PCM core for the format constraints.

  In addition, a workaround for HD-audio HDMI regressions and usual
  HD-audio quirks are found"

* tag 'sound-6.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/hdmi: Preserve the previous PCM device upon re-enablement
  ALSA: hda/realtek: Add quirk for Clevo X370SNW
  ALSA: hda/realtek: fix mute/micmute LEDs for a HP ProBook
  ASoC: SOF: avoid a NULL dereference with unsupported widgets
  ASoC: da7213.c: add missing pm_runtime_disable()
  ASoC: hdac_hdmi: use set_stream() instead of set_tdm_slots()
  ASoC: codecs: lpass: fix the order or clks turn off during suspend
  ASoC: Intel: bytcr_rt5640: Add quirk for the Acer Iconia One 7 B1-750
  ASoC: SOF: ipc4: Ensure DSP is in D0I0 during sof_ipc4_set_get_data()
  ASoC: amd: yc: Add DMI entries to support Victus by HP Laptop 16-e1xxx (8A22)
  ASoC: soc-pcm: fix hw->formats cleared by soc_pcm_hw_init() for dpcm
  ASoC: Intel: soc-acpi: add table for Intel 'Rooks County' NUC M15
  ASOC: Intel: sof_sdw: add quirk for Intel 'Rooks County' NUC M15
parents 8dfab523 f785f5ee

sound/pci/hda/patch_hdmi.c

+11 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ struct hdmi_spec_per_pin { 
	struct delayed_work work;

	struct hdmi_pcm *pcm; /* pointer to spec->pcm_rec[n] dynamically*/

	int pcm_idx; /* which pcm is attached. -1 means no pcm is attached */

	int prev_pcm_idx; /* previously assigned pcm index */

	int repoll_count;

	bool setup; /* the stream has been set up by prepare callback */

	bool silent_stream;
@@ -1380,9 +1381,17 @@ static void hdmi_attach_hda_pcm(struct hdmi_spec *spec, 
	/* pcm already be attached to the pin */

	if (per_pin->pcm)

		return;

	/* try the previously used slot at first */

	idx = per_pin->prev_pcm_idx;

	if (idx >= 0) {

		if (!test_bit(idx, &spec->pcm_bitmap))

			goto found;

		per_pin->prev_pcm_idx = -1; /* no longer valid, clear it */

	}

	idx = hdmi_find_pcm_slot(spec, per_pin);

	if (idx == -EBUSY)

		return;

 found:

	per_pin->pcm_idx = idx;

	per_pin->pcm = get_hdmi_pcm(spec, idx);

	set_bit(idx, &spec->pcm_bitmap);
@@ -1398,6 +1407,7 @@ static void hdmi_detach_hda_pcm(struct hdmi_spec *spec, 
		return;

	idx = per_pin->pcm_idx;

	per_pin->pcm_idx = -1;

	per_pin->prev_pcm_idx = idx; /* remember the previous index */

	per_pin->pcm = NULL;

	if (idx >= 0 && idx < spec->pcm_used)

		clear_bit(idx, &spec->pcm_bitmap);
@@ -1924,6 +1934,7 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) 


		per_pin->pcm = NULL;

		per_pin->pcm_idx = -1;

		per_pin->prev_pcm_idx = -1;

		per_pin->pin_nid = pin_nid;

		per_pin->pin_nid_idx = spec->num_nids;

		per_pin->dev_id = i;

sound/pci/hda/patch_realtek.c

+2 −0
Original line number Diff line number Diff line
@@ -2624,6 +2624,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1462, 0xda57, "MSI Z270-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS),

	SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3),

	SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX),

	SND_PCI_QUIRK(0x1558, 0x3702, "Clevo X370SN[VW]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),

	SND_PCI_QUIRK(0x1558, 0x50d3, "Clevo PC50[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),

	SND_PCI_QUIRK(0x1558, 0x65d1, "Clevo PB51[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),

	SND_PCI_QUIRK(0x1558, 0x65d2, "Clevo PB51R[CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
@@ -9443,6 +9444,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8b47, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8b5d, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8b5e, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8b66, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8b7a, "HP", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8b7d, "HP", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8b87, "HP", ALC236_FIXUP_HP_GPIO_LED),

sound/soc/amd/yc/acp6x-mach.c

+7 −0
Original line number Diff line number Diff line
@@ -269,6 +269,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "8A43"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "HP"),

			DMI_MATCH(DMI_BOARD_NAME, "8A22"),

		}

	},

	{}

};

sound/soc/codecs/da7213.c

+6 −0
Original line number Diff line number Diff line
@@ -2022,6 +2022,11 @@ static int da7213_i2c_probe(struct i2c_client *i2c) 
	return ret;

}



static void da7213_i2c_remove(struct i2c_client *i2c)

{

	pm_runtime_disable(&i2c->dev);

}



static int __maybe_unused da7213_runtime_suspend(struct device *dev)

{

	struct da7213_priv *da7213 = dev_get_drvdata(dev);
@@ -2065,6 +2070,7 @@ static struct i2c_driver da7213_i2c_driver = { 
		.pm = &da7213_pm,

	},

	.probe_new	= da7213_i2c_probe,

	.remove		= da7213_i2c_remove,

	.id_table	= da7213_i2c_id,

};

sound/soc/codecs/hdac_hdmi.c

+11 −6
Original line number Diff line number Diff line
@@ -436,23 +436,28 @@ static int hdac_hdmi_setup_audio_infoframe(struct hdac_device *hdev, 
	return 0;

}



static int hdac_hdmi_set_tdm_slot(struct snd_soc_dai *dai,

		unsigned int tx_mask, unsigned int rx_mask,

		int slots, int slot_width)

static int hdac_hdmi_set_stream(struct snd_soc_dai *dai,

				void *stream, int direction)

{

	struct hdac_hdmi_priv *hdmi = snd_soc_dai_get_drvdata(dai);

	struct hdac_device *hdev = hdmi->hdev;

	struct hdac_hdmi_dai_port_map *dai_map;

	struct hdac_hdmi_pcm *pcm;

	struct hdac_stream *hstream;



	dev_dbg(&hdev->dev, "%s: strm_tag: %d\n", __func__, tx_mask);

	if (!stream)

		return -EINVAL;



	hstream = (struct hdac_stream *)stream;



	dev_dbg(&hdev->dev, "%s: strm_tag: %d\n", __func__, hstream->stream_tag);



	dai_map = &hdmi->dai_map[dai->id];



	pcm = hdac_hdmi_get_pcm_from_cvt(hdmi, dai_map->cvt);



	if (pcm)

		pcm->stream_tag = (tx_mask << 4);

		pcm->stream_tag = (hstream->stream_tag << 4);



	return 0;

}
@@ -1544,7 +1549,7 @@ static const struct snd_soc_dai_ops hdmi_dai_ops = { 
	.startup = hdac_hdmi_pcm_open,

	.shutdown = hdac_hdmi_pcm_close,

	.hw_params = hdac_hdmi_set_hw_params,

	.set_tdm_slot = hdac_hdmi_set_tdm_slot,

	.set_stream = hdac_hdmi_set_stream,

};



/*