44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
|
From 89b9366047f51fcef7f7e36f2b351a98326c8656 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
||
|
|
Date: Tue, 12 Jul 2016 22:40:01 +0200
|
||
|
|
Subject: [PATCH] Revert "ALSA: hda - remove controller dependency on i915
|
||
|
|
power well for SKL"
|
||
|
|
|
||
|
|
This reverts commit 03b135cebc47d75ea2dc346770374ab741966955.
|
||
|
|
---
|
||
|
|
sound/pci/hda/hda_intel.c | 4 +++-
|
||
|
|
sound/pci/hda/patch_hdmi.c | 2 +-
|
||
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
|
||
|
|
index e320c44..290d60f 100644
|
||
|
|
--- a/sound/pci/hda/hda_intel.c
|
||
|
|
+++ b/sound/pci/hda/hda_intel.c
|
||
|
|
@@ -361,7 +361,9 @@ enum {
|
||
|
|
#define CONTROLLER_IN_GPU(pci) (((pci)->device == 0x0a0c) || \
|
||
|
|
((pci)->device == 0x0c0c) || \
|
||
|
|
((pci)->device == 0x0d0c) || \
|
||
|
|
- ((pci)->device == 0x160c))
|
||
|
|
+ ((pci)->device == 0x160c) || \
|
||
|
|
+ ((pci)->device == 0xa170) || \
|
||
|
|
+ ((pci)->device == 0x9d70))
|
||
|
|
|
||
|
|
#define IS_SKL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa170)
|
||
|
|
#define IS_SKL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d70)
|
||
|
|
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
|
||
|
|
index d0d5ad8..9203da1 100644
|
||
|
|
--- a/sound/pci/hda/patch_hdmi.c
|
||
|
|
+++ b/sound/pci/hda/patch_hdmi.c
|
||
|
|
@@ -2379,7 +2379,7 @@ static int patch_i915_hsw_hdmi(struct hda_codec *codec)
|
||
|
|
/* For Haswell/Broadwell, the controller is also in the power well and
|
||
|
|
* can cover the codec power request, and so need not set this flag.
|
||
|
|
*/
|
||
|
|
- if (!is_haswell(codec) && !is_broadwell(codec))
|
||
|
|
+ if (!is_haswell(codec) && !is_broadwell(codec) && !is_skylake(codec))
|
||
|
|
codec->core.link_power_control = 1;
|
||
|
|
|
||
|
|
codec->patch_ops.set_power_state = haswell_set_power_state;
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|