[kernel] r15463 - in dists/sid/linux-2.6/debian/patches: bugfix/all bugfix/all/stable series

[Maximilian Attems]

Author: maks
Date: Wed Mar 31 02:24:13 2010
New Revision: 15463

Log:
linus nak'ed the pci quirks patch

Deleted:
   dists/sid/linux-2.6/debian/patches/bugfix/all/pci-quirk-rs780-rs880-work-around-missing-msi-initialization.patch
Modified:
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.11-rc1.patch
   dists/sid/linux-2.6/debian/patches/series/11

Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.11-rc1.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.11-rc1.patch	Wed Mar 31 01:58:52 2010	(r15462)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.11-rc1.patch	Wed Mar 31 02:24:13 2010	(r15463)
@@ -1913,58 +1913,6 @@
  
  	return 0;
  }
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 245d2cd..525c3a3 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -2463,6 +2463,39 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4374,
- DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4375,
- 			quirk_msi_intx_disable_bug);
- 
-+/*
-+ * MSI does not work with the AMD RS780/RS880 internal graphics and HDMI audio
-+ * devices unless the BIOS has initialized the nb_cntl.strap_msi_enable bit.
-+ */
-+static void __init rs780_int_gfx_disable_msi(struct pci_dev *int_gfx_bridge)
-+{
-+	u32 nb_cntl;
-+
-+	if (!int_gfx_bridge->subordinate)
-+		return;
-+
-+	pci_bus_write_config_dword(int_gfx_bridge->bus, PCI_DEVFN(0, 0),
-+				   0x60, 0);
-+	pci_bus_read_config_dword(int_gfx_bridge->bus, PCI_DEVFN(0, 0),
-+				  0x64, &nb_cntl);
-+
-+	if (!(nb_cntl & BIT(10))) {
-+		dev_warn(&int_gfx_bridge->dev,
-+			 FW_WARN "RS780: MSI for internal graphics disabled\n");
-+		int_gfx_bridge->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI;
-+	}
-+}
-+
-+#define PCI_DEVICE_ID_AMD_RS780_P2P_INT_GFX	0x9602
-+
-+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD,
-+			PCI_DEVICE_ID_AMD_RS780_P2P_INT_GFX,
-+			rs780_int_gfx_disable_msi);
-+/* wrong vendor ID on M4A785TD motherboard: */
-+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASUSTEK,
-+			PCI_DEVICE_ID_AMD_RS780_P2P_INT_GFX,
-+			rs780_int_gfx_disable_msi);
-+
- #endif /* CONFIG_PCI_MSI */
- 
- #ifdef CONFIG_PCI_IOV
-@@ -2513,6 +2546,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x10e7, quirk_i82576_sriov);
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x10e8, quirk_i82576_sriov);
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150a, quirk_i82576_sriov);
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov);
-+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
- 
- #endif	/* CONFIG_PCI_IOV */
- 
 diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
 index c790d45..cae6b2c 100644
 --- a/drivers/scsi/mvsas/mv_init.c

Modified: dists/sid/linux-2.6/debian/patches/series/11
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/11	Wed Mar 31 01:58:52 2010	(r15462)
+++ dists/sid/linux-2.6/debian/patches/series/11	Wed Mar 31 02:24:13 2010	(r15463)
@@ -16,4 +16,3 @@
 + bugfix/all/drm-i915-avoid-null-deref-in-get_pages-unwind-after-error.patch
 + bugfix/all/drm-i915-fix-small-leak-on-overlay-error-path.patch
 + bugfix/all/drm-nouveau-report-unknown-connector-state-if-lid-closed.patch
-+ bugfix/all/pci-quirk-rs780-rs880-work-around-missing-msi-initialization.patch