[kernel] r12801 - in dists/sid/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Dann Frazier]

Author: dannf
Date: Fri Feb 13 18:28:31 2009
New Revision: 12801

Log:
intel-agp: Add support for G41 chipset (Closes: #513228)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/x86/agp-intel-add-support-for-G41-chipset.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/14

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri Feb 13 18:28:31 2009
@@ -23,6 +23,7 @@
   * security: introduce missing kfree (CVE-2009-0031)
   * eCryptfs: check readlink result for error before use (CVE-2009-0269)
   * dell_rbu: use scnprintf instead of less secure sprintf (CVE-2009-0322)
+  * intel-agp: Add support for G41 chipset (Closes: #513228)
 
   [ Martin Michlmayr ]
   * rt2x00: Fix VGC lower bound initialization. (Closes: #510607)
@@ -33,7 +34,7 @@
   * [sparc] Revert: Reintroduce dummy PCI host controller to workaround broken
     X.org. Not supportable and breaks to many things.
 
- -- dann frazier <dannf at debian.org>  Mon, 09 Feb 2009 21:47:45 -0700
+ -- dann frazier <dannf at debian.org>  Fri, 13 Feb 2009 10:46:22 -0700
 
 linux-2.6 (2.6.26-13) unstable; urgency=high
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/x86/agp-intel-add-support-for-G41-chipset.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/agp-intel-add-support-for-G41-chipset.patch	Fri Feb 13 18:28:31 2009
@@ -0,0 +1,59 @@
+commit a50ccc6c6623ab0e64f2109881e07c176b2d876f
+Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
+Date:   Mon Nov 17 14:39:00 2008 +0800
+
+    agp/intel: add support for G41 chipset
+    
+    Signed-off-by: Zhenyu Wang <zhenyu.z.wang at intel.com>
+    Signed-off-by: Eric Anholt <eric at anholt.net>
+    Signed-off-by: Dave Airlie <airlied at linux.ie>
+
+Adjusted to apply to Debian's 2.6.26 by dann frazier <dannf at debian.org>
+
+diff -urpN linux-source-2.6.26.orig/drivers/char/agp/intel-agp.c linux-source-2.6.26/drivers/char/agp/intel-agp.c
+--- linux-source-2.6.26.orig/drivers/char/agp/intel-agp.c	2009-01-10 05:42:12.000000000 -0700
++++ linux-source-2.6.26/drivers/char/agp/intel-agp.c	2009-02-13 10:43:58.000000000 -0700
+@@ -40,6 +40,8 @@
+ #define PCI_DEVICE_ID_INTEL_Q45_IG          0x2E12
+ #define PCI_DEVICE_ID_INTEL_G45_HB          0x2E20
+ #define PCI_DEVICE_ID_INTEL_G45_IG          0x2E22
++#define PCI_DEVICE_ID_INTEL_G41_HB          0x2E30
++#define PCI_DEVICE_ID_INTEL_G41_IG          0x2E32
+ 
+ /* cover 915 and 945 variants */
+ #define IS_I915 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_E7221_HB || \
+@@ -63,7 +65,8 @@
+ #define IS_G4X (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGD_E_HB || \
+ 		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q45_HB || \
+ 		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G45_HB || \
+-		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_GM45_HB)
++		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_GM45_HB || \
++		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G41_HB)
+ 
+ extern int agp_memory_reserved;
+ 
+@@ -1188,6 +1191,7 @@ static void intel_i965_get_gtt_range(int
+ 	case PCI_DEVICE_ID_INTEL_IGD_E_HB:
+ 	case PCI_DEVICE_ID_INTEL_Q45_HB:
+ 	case PCI_DEVICE_ID_INTEL_G45_HB:
++	case PCI_DEVICE_ID_INTEL_G41_HB:
+ 		*gtt_offset = *gtt_size = MB(2);
+ 		break;
+ 	default:
+@@ -2127,6 +2131,8 @@ static const struct intel_driver_descrip
+ 	    "Q45/Q43", NULL, &intel_i965_driver },
+ 	{ PCI_DEVICE_ID_INTEL_G45_HB, PCI_DEVICE_ID_INTEL_G45_IG, 0,
+ 	    "G45/G43", NULL, &intel_i965_driver },
++	{ PCI_DEVICE_ID_INTEL_G41_HB, PCI_DEVICE_ID_INTEL_G41_IG, 0,
++	    "G41", NULL, &intel_i965_driver },
+ 	{ 0, 0, 0, NULL, NULL, NULL }
+ };
+ 
+@@ -2321,6 +2327,7 @@ static struct pci_device_id agp_intel_pc
+ 	ID(PCI_DEVICE_ID_INTEL_IGD_E_HB),
+ 	ID(PCI_DEVICE_ID_INTEL_Q45_HB),
+ 	ID(PCI_DEVICE_ID_INTEL_G45_HB),
++	ID(PCI_DEVICE_ID_INTEL_G41_HB),
+ 	{ }
+ };
+ 

Modified: dists/sid/linux-2.6/debian/patches/series/14
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/14	(original)
+++ dists/sid/linux-2.6/debian/patches/series/14	Fri Feb 13 18:28:31 2009
@@ -64,3 +64,4 @@
 + bugfix/all/security-keyctl-missing-kfree.patch
 + bugfix/all/ecryptfs-check-readlink-result-before-use.patch
 + bugfix/x86/dell_rbu-use-scnprintf-instead-of-sprintf.patch
++ bugfix/x86/agp-intel-add-support-for-G41-chipset.patch