From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756990AbbHDOre (ORCPT ); Tue, 4 Aug 2015 10:47:34 -0400 Received: from mx2.suse.de ([195.135.220.15]:59996 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756970AbbHDOrb (ORCPT ); Tue, 4 Aug 2015 10:47:31 -0400 Date: Tue, 04 Aug 2015 16:47:30 +0200 Message-ID: From: Takashi Iwai To: Jiri Slaby Cc: stable@vger.kernel.org, linux-kernel@vger.kernel.org, Libin Yang Subject: Re: [PATCH 3.12 017/123] ALSA: hda_intel: add AZX_DCAPS_I915_POWERWELL for SKL and BSW In-Reply-To: References: User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.5 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 04 Aug 2015 16:39:21 +0200, Jiri Slaby wrote: > > From: Libin Yang > > 3.12-stable review patch. If anyone has any objections, please let me know. > > =============== > > commit 2d846c74027231264e57e4e34faf9576394e3ce0 upstream. > > HDMI/DP codec on SKL/BSW is in the power well. > The power well must be turned on before probing the > HDMI/DP codec. > > This is a temporary patch, which will power on the > powerwell by adding AZX_DCAPS_I915_POWERWELL for SKL > and BSW. After restructuring and new flag is added, > this patch will be reverted. > > Signed-off-by: Libin Yang > Signed-off-by: Takashi Iwai > Signed-off-by: Jiri Slaby Since the i915 side hook for SKL/BSW is missing on 3.12, applying this blindly may be seen as a regression. So, please drop this for now. (For SLE12, I'm going to provide an additional patch to paper over the failure path.) thanks, Takashi > --- > sound/pci/hda/hda_intel.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > index ab4b984ef607..c4ab8787273e 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -622,8 +622,12 @@ enum { > AZX_DCAPS_COUNT_LPIB_DELAY | AZX_DCAPS_PM_RUNTIME | \ > AZX_DCAPS_I915_POWERWELL) > > +#define AZX_DCAPS_INTEL_BRASWELL \ > + (AZX_DCAPS_INTEL_PCH | AZX_DCAPS_I915_POWERWELL) > + > #define AZX_DCAPS_INTEL_SKYLAKE \ > - (AZX_DCAPS_INTEL_PCH | AZX_DCAPS_SEPARATE_STREAM_TAG) > + (AZX_DCAPS_INTEL_PCH | AZX_DCAPS_SEPARATE_STREAM_TAG |\ > + AZX_DCAPS_I915_POWERWELL) > > /* quirks for ATI SB / AMD Hudson */ > #define AZX_DCAPS_PRESET_ATI_SB \ > @@ -4119,7 +4123,7 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { > .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM }, > /* Braswell */ > { PCI_DEVICE(0x8086, 0x2284), > - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, > + .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL }, > /* ICH */ > { PCI_DEVICE(0x8086, 0x2668), > .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC | > -- > 2.5.0 >