aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_hdmi.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 56d3575ee6cc..7ae614d27954 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -2258,9 +2258,15 @@ static int patch_generic_hdmi(struct hda_codec *codec)
2258 /* Try to bind with i915 for Intel HSW+ codecs (if not done yet) */ 2258 /* Try to bind with i915 for Intel HSW+ codecs (if not done yet) */
2259 if ((codec->core.vendor_id >> 16) == 0x8086 && 2259 if ((codec->core.vendor_id >> 16) == 0x8086 &&
2260 is_haswell_plus(codec)) { 2260 is_haswell_plus(codec)) {
2261#if 0
2262 /* on-demand binding leads to an unbalanced refcount when
2263 * both i915 and hda drivers are probed concurrently;
2264 * disabled temporarily for now
2265 */
2261 if (!codec->bus->core.audio_component) 2266 if (!codec->bus->core.audio_component)
2262 if (!snd_hdac_i915_init(&codec->bus->core)) 2267 if (!snd_hdac_i915_init(&codec->bus->core))
2263 spec->i915_bound = true; 2268 spec->i915_bound = true;
2269#endif
2264 /* use i915 audio component notifier for hotplug */ 2270 /* use i915 audio component notifier for hotplug */
2265 if (codec->bus->core.audio_component) 2271 if (codec->bus->core.audio_component)
2266 spec->use_acomp_notifier = true; 2272 spec->use_acomp_notifier = true;