next-20151208 - CONFIG_SND_HDA_I915

[Valdis Kletnieks]

I'm experiencing a spot of trouble with this commit:

commit aad730d0704545ad97654bd929b0aba05adb1436
Author: Takashi Iwai <ti...@suse.de>
Date:   Mon Dec 2 13:33:57 2013 +0100

    ALSA: hda - Always do delayed probes for HD-audio devices

That adds some code:

#ifndef CONFIG_SND_HDA_I915
        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
                dev_err(card->dev, "Haswell must build in 
CONFIG_SND_HDA_I915\n");

"Oh, bother" -- Winnie the Pooh

So I go looking how to fix this, and 'make menuconfig' tells me:

Symbol: SND_HDA_I915 [=n]                                                       
                                      x  
  x Type  : boolean                                                             
                                          x  
  x   Defined at sound/hda/Kconfig:8                                            
                                          x  
  x   Depends on: SOUND [=y] && !M68K && !UML && SND [=y] && DRM_I915 [=n] && 
SND_HDA_CORE [=y]

And why is DRM_I915=n?

# lspci | grep NV
01:00.0 VGA compatible controller: NVIDIA Corporation GF108GLM [NVS 5200M] (rev 
a1)

Because this Dell laptop has NVidia graphics onboard, and no sign of I915
graphics that needs I915 DRM.

I think the infrastructure that you're trying to re-use from DRM_I915 needs
to be moved to another symbol which can be SELECT/DEPEND by both DRM_I915
and SND_HSA_I915.

Comments/suggestions?

pgpKd37F9V7n8.pgp
Description: PGP signature