From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 3 Dec 2014 08:38:03 +0000 (+0100)
Subject: Merge tag 'v3.18-rc7' into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2e3d4de1bd80b2f205aab0ed0a25daef464ab91c;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'v3.18-rc7' into for-next

... for allowing more cleanups of hda_intel.c driver-caps where both
upstream and for-next contain the changes.
---

2e3d4de1bd80b2f205aab0ed0a25daef464ab91c
diff --cc sound/pci/hda/hda_intel.c
index 728663d6746f,48b6c5a3884f..fc7aff0eb562
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@@ -302,21 -298,17 +302,22 @@@ enum 
  
  /* quirks for ATI/AMD HDMI */
  #define AZX_DCAPS_PRESET_ATI_HDMI \
- 	(AZX_DCAPS_NO_TCSEL | AZX_DCAPS_SYNC_WRITE | AZX_DCAPS_POSFIX_LPIB)
+ 	(AZX_DCAPS_NO_TCSEL | AZX_DCAPS_SYNC_WRITE | AZX_DCAPS_POSFIX_LPIB|\
+ 	 AZX_DCAPS_NO_MSI64)
  
 +/* quirks for ATI HDMI with snoop off */
 +#define AZX_DCAPS_PRESET_ATI_HDMI_NS \
 +	(AZX_DCAPS_PRESET_ATI_HDMI | AZX_DCAPS_SNOOP_OFF)
 +
  /* quirks for Nvidia */
  #define AZX_DCAPS_PRESET_NVIDIA \
 -	(AZX_DCAPS_NVIDIA_SNOOP | AZX_DCAPS_RIRB_DELAY | AZX_DCAPS_NO_MSI |\
 -	 AZX_DCAPS_ALIGN_BUFSIZE | AZX_DCAPS_NO_64BIT |\
 -	 AZX_DCAPS_CORBRP_SELF_CLEAR)
 +	(AZX_DCAPS_RIRB_DELAY | AZX_DCAPS_NO_MSI | AZX_DCAPS_ALIGN_BUFSIZE |\
 +	 AZX_DCAPS_NO_64BIT | AZX_DCAPS_CORBRP_SELF_CLEAR |\
 +	 AZX_DCAPS_SNOOP_TYPE(NVIDIA))
  
  #define AZX_DCAPS_PRESET_CTHDA \
 -	(AZX_DCAPS_NO_MSI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_4K_BDLE_BOUNDARY)
 +	(AZX_DCAPS_NO_MSI | AZX_DCAPS_POSFIX_LPIB |\
 +	 AZX_DCAPS_4K_BDLE_BOUNDARY | AZX_DCAPS_SNOOP_OFF)
  
  /*
   * VGA-switcher support
diff --cc sound/pci/hda/hda_priv.h
index 602536c2147d,5016014e57f2..a09703a2b2c1
--- a/sound/pci/hda/hda_priv.h
+++ b/sound/pci/hda/hda_priv.h
@@@ -170,14 -171,8 +170,15 @@@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SD
  #define AZX_DCAPS_PM_RUNTIME	(1 << 26)	/* runtime PM support */
  #define AZX_DCAPS_I915_POWERWELL (1 << 27)	/* HSW i915 powerwell support */
  #define AZX_DCAPS_CORBRP_SELF_CLEAR (1 << 28)	/* CORBRP clears itself after reset */
+ #define AZX_DCAPS_NO_MSI64      (1 << 29)	/* Stick to 32-bit MSIs */
  
 +enum {
 +	AZX_SNOOP_TYPE_NONE ,
 +	AZX_SNOOP_TYPE_SCH,
 +	AZX_SNOOP_TYPE_ATI,
 +	AZX_SNOOP_TYPE_NVIDIA,
 +};
 +
  /* HD Audio class code */
  #define PCI_CLASS_MULTIMEDIA_HD_AUDIO	0x0403