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

Commit 6defb60a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Resolved the conflicts with the latest HDA HDMI fixes.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 03367bf7 790b415c

sound/core/seq/oss/seq_oss.c

+0 −2
Original line number Diff line number Diff line
@@ -149,8 +149,6 @@ odev_release(struct inode *inode, struct file *file) 
	if ((dp = file->private_data) == NULL)

		return 0;



	snd_seq_oss_drain_write(dp);



	mutex_lock(&register_mutex);

	snd_seq_oss_release(dp);

	mutex_unlock(&register_mutex);

sound/core/seq/oss/seq_oss_device.h

+0 −1
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ int snd_seq_oss_write(struct seq_oss_devinfo *dp, const char __user *buf, int co 
unsigned int snd_seq_oss_poll(struct seq_oss_devinfo *dp, struct file *file, poll_table * wait);



void snd_seq_oss_reset(struct seq_oss_devinfo *dp);

void snd_seq_oss_drain_write(struct seq_oss_devinfo *dp);



/* */

void snd_seq_oss_process_queue(struct seq_oss_devinfo *dp, abstime_t time);

sound/core/seq/oss/seq_oss_init.c

+0 −16
Original line number Diff line number Diff line
@@ -435,22 +435,6 @@ snd_seq_oss_release(struct seq_oss_devinfo *dp) 
}





/*

 * Wait until the queue is empty (if we don't have nonblock)

 */

void

snd_seq_oss_drain_write(struct seq_oss_devinfo *dp)

{

	if (! dp->timer->running)

		return;

	if (is_write_mode(dp->file_mode) && !is_nonblock_mode(dp->file_mode) &&

	    dp->writeq) {

		while (snd_seq_oss_writeq_sync(dp->writeq))

			;

	}

}





/*

 * reset sequencer devices

 */

sound/pci/hda/patch_hdmi.c

+12 −7
Original line number Diff line number Diff line
@@ -2936,13 +2936,6 @@ static int patch_generic_hdmi(struct hda_codec *codec) 
			is_broxton(codec))

		codec->core.link_power_control = 1;



	if (codec_has_acomp(codec)) {

		codec->depop_delay = 0;

		spec->i915_audio_ops.audio_ptr = codec;

		spec->i915_audio_ops.pin_eld_notify = intel_pin_eld_notify;

		snd_hdac_i915_register_notifier(&spec->i915_audio_ops);

	}



	if (hdmi_parse_codec(codec) < 0) {

		if (spec->i915_bound)

			snd_hdac_i915_exit(&codec->bus->core);
@@ -2964,6 +2957,18 @@ static int patch_generic_hdmi(struct hda_codec *codec) 


	init_channel_allocations();



	if (codec_has_acomp(codec)) {

		codec->depop_delay = 0;

		spec->i915_audio_ops.audio_ptr = codec;

		/* intel_audio_codec_enable() or intel_audio_codec_disable()

		 * will call pin_eld_notify with using audio_ptr pointer

		 * We need make sure audio_ptr is really setup

		 */

		wmb();

		spec->i915_audio_ops.pin_eld_notify = intel_pin_eld_notify;

		snd_hdac_i915_register_notifier(&spec->i915_audio_ops);

	}



	WARN_ON(spec->dyn_pcm_assign && !codec_has_acomp(codec));

	return 0;

}

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -5412,6 +5412,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1025, 0x080d, "Acer Aspire V5-122P", ALC269_FIXUP_ASPIRE_HEADSET_MIC),

	SND_PCI_QUIRK(0x1025, 0x0740, "Acer AO725", ALC271_FIXUP_HP_GATE_MIC_JACK),

	SND_PCI_QUIRK(0x1025, 0x0742, "Acer AO756", ALC271_FIXUP_HP_GATE_MIC_JACK),

	SND_PCI_QUIRK(0x1025, 0x0762, "Acer Aspire E1-472", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572),

	SND_PCI_QUIRK(0x1025, 0x0775, "Acer Aspire E1-572", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572),

	SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS),

	SND_PCI_QUIRK(0x1025, 0x106d, "Acer Cloudbook 14", ALC283_FIXUP_CHROME_BOOK),