[alsa-devel] [PATCH] ALSA: hda - Try to allow haswell HDMI audio even without powerwell

[Takashi Iwai]

At Mon, 19 Aug 2013 13:32:30 +0200,
David Henningsson wrote:
> 
> If compiled without CONFIG_SND_HDA_I915, the audio driver cannot
> request power well. However, if the power well is on for other
> reasons, maybe audio can still work. Therefore, do not skip the
> card completely if compiled without CONFIG_SND_HDA_I915.
> 
> Signed-off-by: David Henningsson <david.henningsson at canonical.com>
> ---
>  sound/pci/hda/hda_intel.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> I'm going to apply this on my local DKMS tree, it's important for our backports
> as we combine different versions of the kernel with backports for haswell etc.
> I'm not sure if this is beneficial to have on 3.11+ kernels as well, but I guess
> it could be. At least it shouldn't harm.

Hm, OK, although ifdef isn't sexy, this looks like more reasonable
behavior.

Applied now.  Thanks.


Takashi

> 
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index 7f9e406..c6c9829 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -3855,11 +3855,13 @@ static int azx_probe_continue(struct azx *chip)
>  
>  	/* Request power well for Haswell HDA controller and codec */
>  	if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
> +#ifdef CONFIG_SND_HDA_I915
>  		err = hda_i915_init();
>  		if (err < 0) {
>  			snd_printk(KERN_ERR SFX "Error request power-well from i915\n");
>  			goto out_free;
>  		}
> +#endif
>  		hda_display_power(true);
>  	}
>  
> -- 
> 1.7.9.5
>