Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3446b1e9 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Back-merge for applying more series of fixes for USB DSD support.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 21e9b3e9 b0021486

sound/drivers/aloop.c

+15 −2
Original line number Diff line number Diff line
@@ -192,6 +192,11 @@ static inline void loopback_timer_stop(struct loopback_pcm *dpcm) 
	dpcm->timer.expires = 0;

}



static inline void loopback_timer_stop_sync(struct loopback_pcm *dpcm)

{

	del_timer_sync(&dpcm->timer);

}



#define CABLE_VALID_PLAYBACK	(1 << SNDRV_PCM_STREAM_PLAYBACK)

#define CABLE_VALID_CAPTURE	(1 << SNDRV_PCM_STREAM_CAPTURE)

#define CABLE_VALID_BOTH	(CABLE_VALID_PLAYBACK|CABLE_VALID_CAPTURE)
@@ -326,6 +331,8 @@ static int loopback_prepare(struct snd_pcm_substream *substream) 
	struct loopback_cable *cable = dpcm->cable;

	int bps, salign;



	loopback_timer_stop_sync(dpcm);



	salign = (snd_pcm_format_width(runtime->format) *

						runtime->channels) / 8;

	bps = salign * runtime->rate;
@@ -659,7 +666,9 @@ static void free_cable(struct snd_pcm_substream *substream) 
		return;

	if (cable->streams[!substream->stream]) {

		/* other stream is still alive */

		spin_lock_irq(&cable->lock);

		cable->streams[substream->stream] = NULL;

		spin_unlock_irq(&cable->lock);

	} else {

		/* free the cable */

		loopback->cables[substream->number][dev] = NULL;
@@ -698,7 +707,6 @@ static int loopback_open(struct snd_pcm_substream *substream) 
		loopback->cables[substream->number][dev] = cable;

	}

	dpcm->cable = cable;

	cable->streams[substream->stream] = dpcm;



	snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
@@ -730,6 +738,11 @@ static int loopback_open(struct snd_pcm_substream *substream) 
		runtime->hw = loopback_pcm_hardware;

	else

		runtime->hw = cable->hw;



	spin_lock_irq(&cable->lock);

	cable->streams[substream->stream] = dpcm;

	spin_unlock_irq(&cable->lock);



 unlock:

	if (err < 0) {

		free_cable(substream);
@@ -744,7 +757,7 @@ static int loopback_close(struct snd_pcm_substream *substream) 
	struct loopback *loopback = substream->private_data;

	struct loopback_pcm *dpcm = substream->runtime->private_data;



	loopback_timer_stop(dpcm);

	loopback_timer_stop_sync(dpcm);

	mutex_lock(&loopback->cable_lock);

	free_cable(substream);

	mutex_unlock(&loopback->cable_lock);

sound/pci/hda/hda_intel.c

+5 −0
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ enum { 
					((pci)->device == 0x160c))



#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)

#define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348)



static char *driver_short_names[] = {

	[AZX_DRIVER_ICH] = "HDA Intel",
@@ -1744,6 +1745,10 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, 
	else

		chip->bdl_pos_adj = bdl_pos_adj[dev];



	/* Workaround for a communication error on CFL (bko#199007) */

	if (IS_CFL(pci))

		chip->polling_mode = 1;



	err = azx_bus_init(chip, model[dev], &pci_hda_io_ops);

	if (err < 0) {

		kfree(hda);

sound/pci/hda/patch_realtek.c

+14 −0
Original line number Diff line number Diff line
@@ -3130,6 +3130,8 @@ static void alc256_init(struct hda_codec *codec) 


	alc_update_coef_idx(codec, 0x46, 3 << 12, 0);

	alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x4); /* Hight power */

	alc_update_coefex_idx(codec, 0x53, 0x02, 0x8000, 1 << 15); /* Clear bit */

	alc_update_coefex_idx(codec, 0x53, 0x02, 0x8000, 0 << 15);

}



static void alc256_shutup(struct hda_codec *codec)
@@ -5501,6 +5503,7 @@ enum { 
	ALC274_FIXUP_DELL_AIO_LINEOUT_VERB,

	ALC298_FIXUP_TPT470_DOCK,

	ALC255_FIXUP_DUMMY_LINEOUT_VERB,

	ALC255_FIXUP_DELL_HEADSET_MIC,

};



static const struct hda_fixup alc269_fixups[] = {
@@ -6361,6 +6364,13 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE

	},

	[ALC255_FIXUP_DELL_HEADSET_MIC] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {

			{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */

			{ }

		},

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -6415,6 +6425,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x082a, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE),

	SND_PCI_QUIRK(0x1028, 0x084b, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),

	SND_PCI_QUIRK(0x1028, 0x084e, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),

	SND_PCI_QUIRK(0x1028, 0x0871, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC),

	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, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
@@ -7158,6 +7170,8 @@ static int patch_alc269(struct hda_codec *codec) 
		break;

	case 0x10ec0257:

		spec->codec_variant = ALC269_TYPE_ALC257;

		spec->shutup = alc256_shutup;

		spec->init_hook = alc256_init;

		spec->gen.mixer_nid = 0;

		break;

	case 0x10ec0215:

sound/usb/quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -1171,6 +1171,7 @@ static bool is_teac_dsd_dac(unsigned int id) 
	switch (id) {

	case USB_ID(0x0644, 0x8043): /* TEAC UD-501/UD-503/NT-503 */

	case USB_ID(0x0644, 0x8044): /* Esoteric D-05X */

	case USB_ID(0x0644, 0x804a): /* TEAC UD-301 */

		return true;

	}

	return false;