From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [PATCH] ALSA: hda - remove controller dependency on i915 power well for SKL Date: Wed, 03 Jun 2015 07:39:34 +0200 Message-ID: References: <1433295015-547-1-git-send-email-libin.yang@intel.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id D16D626588A for ; Wed, 3 Jun 2015 07:39:35 +0200 (CEST) In-Reply-To: <1433295015-547-1-git-send-email-libin.yang@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: libin.yang@intel.com Cc: alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org At Wed, 3 Jun 2015 09:30:15 +0800, libin.yang@intel.com wrote: > > From: Libin Yang > > For SKL, only the HDMI codec is in the display power well while the > HD-A controller isn't. So the controller flag 'need_i915_power' is > not set to release the display power after probe, and the codec flag > 'link_power_control" is set to request/release the display power via > bus link_power ops. > > Signed-off-by: Libin Yang Applied, thanks. Takashi > --- > sound/pci/hda/hda_intel.c | 9 +++++++-- > sound/pci/hda/patch_hdmi.c | 2 +- > 2 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > index 391e4f8..e5597fd 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -345,6 +345,11 @@ enum { > #define use_vga_switcheroo(chip) 0 > #endif > > +#define CONTROLLER_IN_GPU(pci) (((pci)->device == 0x0a0c) || \ > + ((pci)->device == 0x0c0c) || \ > + ((pci)->device == 0x0d0c) || \ > + ((pci)->device == 0x160c)) > + > static char *driver_short_names[] = { > [AZX_DRIVER_ICH] = "HDA Intel", > [AZX_DRIVER_PCH] = "HDA Intel PCH", > @@ -1976,8 +1981,8 @@ static int azx_probe_continue(struct azx *chip) > * display codec needs the power and it can be released after probe. > */ > if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { > - /* Baytral/Braswell controllers don't need this power */ > - if (pci->device != 0x0f04 && pci->device != 0x2284) > + /* HSW/BDW controllers need this power */ > + if (CONTROLLER_IN_GPU(pci)) > hda->need_i915_power = 1; > > err = snd_hdac_i915_init(bus); > diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c > index 73c20c0..407978b 100644 > --- a/sound/pci/hda/patch_hdmi.c > +++ b/sound/pci/hda/patch_hdmi.c > @@ -2339,7 +2339,7 @@ static int patch_generic_hdmi(struct hda_codec *codec) > * can cover the codec power request, and so need not set this flag. > * For previous platforms, there is no such power well feature. > */ > - if (is_valleyview_plus(codec)) > + if (is_valleyview_plus(codec) || is_skylake(codec)) > codec->core.link_power_control = 1; > > if (is_haswell_plus(codec) || is_valleyview_plus(codec)) > -- > 1.9.1 >