[RFC,2/2] ALSA: hda - remove controller dependency on i915 power well for Baytrail/Braswell

Commit Message

Lin, Mengdong April 24, 2015, 1:02 p.m. UTC

From: Mengdong Lin <[e-mail]>

For Baytrail (Valleyview) and Braswell (Cherryview), not the HD-A controller
but only the display codec is in the shared power well with gfx.

Signed-off-by: Mengdong Lin <[e-mail]>

Patch

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index f6c3e37..ac30667 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1865,6 +1865,10 @@  static int azx_probe_continue(struct azx *chip)
 
 	/* Request power well for Haswell HDA controller and codec */
 	if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
+		/* Baytral/Braswell controllers don't need this power */
+		if (pci->device != 0x0f04 && pci->device != 0x2284)
+			chip->need_i915_power = 1;
+
 #ifdef CONFIG_SND_HDA_I915
 		err = hda_i915_init(hda);
 		if (err < 0)
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 5f44f60..55488ee 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -2335,6 +2335,9 @@  static int patch_generic_hdmi(struct hda_codec *codec)
 		intel_haswell_fixup_enable_dp12(codec);
 	}
 
+	if (is_valleyview_plus(codec))
+		codec->need_i915_power = 1;
+
 	if (is_haswell_plus(codec) || is_valleyview_plus(codec))
 		codec->depop_delay = 0;