diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-12-09 10:10:19 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-12-11 08:18:46 +0100 |
| commit | 46594d3345f0432ddc83b9f3c1b04492fdfafd07 (patch) | |
| tree | 39be3b864f48394a7646e5ba9a1bdf83533cfbc8 | |
| parent | 77a49672aae384125942ce621365b11d42cefa32 (diff) | |
| download | linux-46594d3345f0432ddc83b9f3c1b04492fdfafd07.tar.gz linux-46594d3345f0432ddc83b9f3c1b04492fdfafd07.tar.bz2 linux-46594d3345f0432ddc83b9f3c1b04492fdfafd07.zip | |
ALSA: hda/hdmi: Always set display_power_control for Intel HSW+ codecs
We've excluded the display_power_control flag for Intel HSW and BDW
codecs as the HD-audio controllers of the corresponding platforms take
care of the display power as well. But the recent refactoring
separates the controller and the codec power accounting, so it's fine
to call the display PM even for HSW/BDW codecs. This is less
confusing since we can avoid this well-hidden condition.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 30fe4dbdb0ae..15290e4706e0 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2616,11 +2616,7 @@ static int intel_hsw_common_init(struct hda_codec *codec, hda_nid_t vendor_nid) intel_haswell_enable_all_pins(codec, true); intel_haswell_fixup_enable_dp12(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)) - codec->display_power_control = 1; + codec->display_power_control = 1; codec->patch_ops.set_power_state = haswell_set_power_state; codec->depop_delay = 0; |