Commit ea329298 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Merge 6.3-devel branch back in order to apply the more Realtek HD-audio
changes cleanly.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents c51e4310 2ae147d6

Documentation/sound/hd-audio/models.rst

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ ref 
no-jd

    BIOS setup but without jack-detection

intel

    Intel DG45* mobos

    Intel D*45* mobos

dell-m6-amic

    Dell desktops/laptops with analog mics

dell-m6-dmic

sound/firewire/tascam/tascam-stream.c

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate) 
		// packet is important for media clock recovery.

		err = amdtp_domain_start(&tscm->domain, tx_init_skip_cycles, true, true);

		if (err < 0)

			return err;

			goto error;



		if (!amdtp_domain_wait_ready(&tscm->domain, READY_TIMEOUT_MS)) {

			err = -ETIMEDOUT;

sound/i2c/cs8427.c

+5 −2
Original line number Diff line number Diff line
@@ -561,10 +561,13 @@ int snd_cs8427_iec958_active(struct snd_i2c_device *cs8427, int active) 
	if (snd_BUG_ON(!cs8427))

		return -ENXIO;

	chip = cs8427->private_data;

	if (active)

	if (active) {

		memcpy(chip->playback.pcm_status,

		       chip->playback.def_status, 24);

		chip->playback.pcm_ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;

	} else {

		chip->playback.pcm_ctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;

	}

	snd_ctl_notify(cs8427->bus->card,

		       SNDRV_CTL_EVENT_MASK_VALUE | SNDRV_CTL_EVENT_MASK_INFO,

		       &chip->playback.pcm_ctl->id);

sound/pci/emu10k1/emupcm.c

+9 −5
Original line number Diff line number Diff line
@@ -1183,7 +1183,7 @@ static int snd_emu10k1_capture_mic_close(struct snd_pcm_substream *substream) 
{

	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);



	emu->capture_interrupt = NULL;

	emu->capture_mic_interrupt = NULL;

	emu->pcm_capture_mic_substream = NULL;

	return 0;

}
@@ -1290,7 +1290,7 @@ static int snd_emu10k1_capture_efx_close(struct snd_pcm_substream *substream) 
{

	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);



	emu->capture_interrupt = NULL;

	emu->capture_efx_interrupt = NULL;

	emu->pcm_capture_efx_substream = NULL;

	return 0;

}
@@ -1728,16 +1728,20 @@ int snd_emu10k1_pcm_efx(struct snd_emu10k1 *emu, int device) 
	struct snd_kcontrol *kctl;

	int err;



	err = snd_pcm_new(emu->card, "emu10k1 efx", device, 8, 1, &pcm);

	err = snd_pcm_new(emu->card, "emu10k1 efx", device, emu->audigy ? 0 : 8, 1, &pcm);

	if (err < 0)

		return err;



	pcm->private_data = emu;



	if (!emu->audigy)

		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_fx8010_playback_ops);

	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_efx_ops);



	pcm->info_flags = 0;

	if (emu->audigy)

		strcpy(pcm->name, "Multichannel Capture");

	else

		strcpy(pcm->name, "Multichannel Capture/PT Playback");

	emu->pcm_efx = pcm;

sound/pci/hda/patch_hdmi.c

+12 −1
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;
@@ -4611,7 +4622,7 @@ HDA_CODEC_ENTRY(0x80862814, "DG1 HDMI", patch_i915_tgl_hdmi), 
HDA_CODEC_ENTRY(0x80862815, "Alderlake HDMI",	patch_i915_tgl_hdmi),

HDA_CODEC_ENTRY(0x80862816, "Rocketlake HDMI",	patch_i915_tgl_hdmi),

HDA_CODEC_ENTRY(0x80862818, "Raptorlake HDMI",	patch_i915_tgl_hdmi),

HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI",	patch_i915_adlp_hdmi),

HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI",	patch_i915_tgl_hdmi),

HDA_CODEC_ENTRY(0x8086281a, "Jasperlake HDMI",	patch_i915_icl_hdmi),

HDA_CODEC_ENTRY(0x8086281b, "Elkhartlake HDMI",	patch_i915_icl_hdmi),

HDA_CODEC_ENTRY(0x8086281c, "Alderlake-P HDMI", patch_i915_adlp_hdmi),