| Message ID | 1428409940-141877-1-git-send-email-libin.yang@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2d846c74027231264e57e4e34faf9576394e3ce0 |
| Headers | show |
At Tue, 7 Apr 2015 20:32:20 +0800, libin.yang@intel.com wrote: > > From: Libin Yang <libin.yang@intel.com> > > 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@intel.com> Applied, 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 15a8299..e1c2105 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -297,8 +297,12 @@ enum { > AZX_DCAPS_PM_RUNTIME | AZX_DCAPS_I915_POWERWELL |\ > AZX_DCAPS_SNOOP_TYPE(SCH)) > > +#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 \ > @@ -1991,7 +1995,7 @@ static const struct pci_device_id 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 }, > /* ICH6 */ > { PCI_DEVICE(0x8086, 0x2668), > .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH }, > -- > 1.9.1 >
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 15a8299..e1c2105 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -297,8 +297,12 @@ enum { AZX_DCAPS_PM_RUNTIME | AZX_DCAPS_I915_POWERWELL |\ AZX_DCAPS_SNOOP_TYPE(SCH)) +#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 \ @@ -1991,7 +1995,7 @@ static const struct pci_device_id 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 }, /* ICH6 */ { PCI_DEVICE(0x8086, 0x2668), .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },