rpms/kernel/devel kernel-2.6.spec, 1.3058, 1.3059 linux-2.6-i965gm-support.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24338

Modified Files:
	kernel-2.6.spec linux-2.6-i965gm-support.patch 
Log Message:
* Wed Apr 11 2007 Dave Jones <davej at redhat.com>
- DRM support for Intel 965GM



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3058
retrieving revision 1.3059
diff -u -r1.3058 -r1.3059
--- kernel-2.6.spec	11 Apr 2007 20:40:48 -0000	1.3058
+++ kernel-2.6.spec	11 Apr 2007 21:18:18 -0000	1.3059
@@ -383,6 +383,7 @@
 Patch15: git-iwlwifi-fixes.patch
 Patch16: linux-2.6-rt2x00-scan-fix.patch
 Patch17: linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch
+# FIXME: The wireless stuff really belongs in its own section given there's so much of it.
 
 Patch18: linux-2.6-fix-pmops-1.patch
 Patch19: linux-2.6-fix-pmops-2.patch
@@ -390,8 +391,12 @@
 Patch21: linux-2.6-fix-pmops-4.patch
 
 # enable sysrq-c on all kernels, not only kexec
+# FIXME: upstream soon? When? It's been here for ages.
 Patch22: linux-2.6-sysrq-c.patch
 
+# DRM bits for 965
+Patch23: linux-2.6-i965gm-support.patch
+
 # Patches 100 through 500 are meant for architecture patches
 
 # 200 - 299   x86(-64)
@@ -995,6 +1000,9 @@
 # sysrq works always
 %patch22 -p1
 
+# DRM support for 965GM
+%patch23 -p1
+
 # Architecture patches
 
 #
@@ -2256,6 +2264,9 @@
 
 %changelog
 * Wed Apr 11 2007 Dave Jones <davej at redhat.com>
+- DRM support for Intel 965GM
+
+* Wed Apr 11 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc6-git4
 
 * Tue Apr 11 2007 John W. Linville <linville at redhat.com>

linux-2.6-i965gm-support.patch:
 drm_pciids.h |    1 +
 i915_dma.c   |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6-i965gm-support.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-i965gm-support.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-i965gm-support.patch	5 Apr 2007 18:16:12 -0000	1.1
+++ linux-2.6-i965gm-support.patch	11 Apr 2007 21:18:18 -0000	1.2
@@ -1,43 +1,3 @@
---- linux-2.6.20.noarch/drivers/char/agp/intel-agp.c.jx	2007-04-05 05:18:01.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/char/agp/intel-agp.c	2007-04-05 05:18:12.000000000 -0400
-@@ -18,11 +18,14 @@
- #define PCI_DEVICE_ID_INTEL_82965Q_IG       0x2992
- #define PCI_DEVICE_ID_INTEL_82965G_HB       0x29A0
- #define PCI_DEVICE_ID_INTEL_82965G_IG       0x29A2
-+#define PCI_DEVICE_ID_INTEL_82965GM_HB      0x2A00
-+#define PCI_DEVICE_ID_INTEL_82965GM_IG      0x2A02
- 
- #define IS_I965 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82946GZ_HB || \
-                  agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_1_HB || \
-                  agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965Q_HB || \
--                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_HB)
-+                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_HB || \
-+                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GM_HB)
- 
- 
- extern int agp_memory_reserved;
-@@ -1921,7 +1924,13 @@
- 			bridge->driver = &intel_845_driver;
- 		name = "965G";
- 		break;
--
-+	case PCI_DEVICE_ID_INTEL_82965GM_HB:
-+		if (find_i830(PCI_DEVICE_ID_INTEL_82965GM_IG))
-+			bridge->driver = &intel_i965_driver;
-+		else
-+			bridge->driver = &intel_845_driver;
-+		name = "965GM";
-+		break;
- 	case PCI_DEVICE_ID_INTEL_7505_0:
- 		bridge->driver = &intel_7505_driver;
- 		name = "E7505";
-@@ -2080,6 +2089,7 @@
- 	ID(PCI_DEVICE_ID_INTEL_82965G_1_HB),
- 	ID(PCI_DEVICE_ID_INTEL_82965Q_HB),
- 	ID(PCI_DEVICE_ID_INTEL_82965G_HB),
-+	ID(PCI_DEVICE_ID_INTEL_82965GM_HB),
- 	{ }
- };
  
 --- linux-2.6.20.noarch/drivers/char/drm/i915_dma.c.jx	2007-02-04 13:44:54.000000000 -0500
 +++ linux-2.6.20.noarch/drivers/char/drm/i915_dma.c	2007-04-05 05:18:12.000000000 -0400