Re: [PATCH 3.12 017/123] ALSA: hda_intel: add AZX_DCAPS_I915_POWERWELL for SKL and BSW

[Takashi Iwai]

On Tue, 04 Aug 2015 16:39:21 +0200,
Jiri Slaby wrote:
> 
> From: Libin Yang <libin.yang@xxxxxxxxx>
> 
> 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 <libin.yang@xxxxxxxxx>
> Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
> Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>

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
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/