From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 4 Mar 2016 07:41:41 +0000 (+0100)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: v5.15~13889^2~50
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6defb60ae4ffe92c29291ed49695daa255b8f559;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-linus' into for-next

Resolved the conflicts with the latest HDA HDMI fixes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

6defb60ae4ffe92c29291ed49695daa255b8f559
diff --cc sound/pci/hda/patch_hdmi.c
index 490931d,bcbc4ee..fe4141c
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@@ -2964,7 -2498,18 +2957,19 @@@ static int patch_generic_hdmi(struct hd
  
  	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;
  }