rpms/kernel/devel linux-2.6-drm-mga-oops.patch, NONE, 1.1 kernel-2.6.spec, 1.1695, 1.1696

[fedora-cvs-commits at redhat.com]

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-drm-mga-oops.patch 
Log Message:
fix mga oops

linux-2.6-drm-mga-oops.patch:
 mga_drv.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-drm-mga-oops.patch ---
diff --git a/drivers/char/drm/mga_drv.c b/drivers/char/drm/mga_drv.c
--- a/drivers/char/drm/mga_drv.c
+++ b/drivers/char/drm/mga_drv.c
@@ -161,7 +161,7 @@ static int mga_driver_device_is_agp(drm_
 	 * device.
 	 */
 
-	if ((pdev->device == 0x0525)
+	if ((pdev->device == 0x0525) && pdev->bus->self &&
 	    && (pdev->bus->self->vendor == 0x3388)
 	    && (pdev->bus->self->device == 0x0021)) {
 		return 0;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1695
retrieving revision 1.1696
diff -u -r1.1695 -r1.1696
--- kernel-2.6.spec	19 Nov 2005 19:23:49 -0000	1.1695
+++ kernel-2.6.spec	19 Nov 2005 23:40:41 -0000	1.1696
@@ -225,6 +225,7 @@
 Patch305: linux-2.6.15-rc1-ppc64-pci.patch
 Patch306: linux-2.6.15-ppc-cell-basics.patch
 Patch307: linux-2.6.15-rc1-ppc64-sparsemem.patch
+Patch308: linux-2.6-drm-mga-oops.patch
 
 # 400 - 499   ia64
 # 500 - 599   s390(x)
@@ -605,6 +606,7 @@
 %patch305 -p1
 %patch306 -p1 
 %patch307 -p1
+%patch308 -p1
 
 #
 # Xen
@@ -1297,6 +1299,7 @@
 %changelog
 * Sat Nov 19 2005 David Woodhouse <dwmw2 at redhat.com>
 - Make kernel-devel packages work again for ppc/ppc64
+- Fix oops with MGA on root PCI bus
 
 * Fri Nov 18 2005 David Woodhouse <dwmw2 at redhat.com>
 - Fix ppc64 sparsemem with memory holes.