[PATCH] Re: 2.6.10-rc2-mm1 i810 DRM oops

[Joseph F. <jh...@ri...>]

> I'm getting this Oops when starting X, which first showed up in
> 2.6.10-rc1-mm3. I'm guessing the i810 DRM needs fixing for 4-level
> page tables?  AGP and DRM are built-in; i810fb is disabled.  Disabling
> DRM prevents the Oops and lets X start.

Please accept my apologies for being too quick to point the finger at
the 4-level patches.  I've found the problem in changes in the drm bk
repository, and it's not related.

It looks like the Oops-causing change is the 'move fops into drivers':
http://drm.bkbits.net:8080/drm-2.6/cset@418a0608l2KOkX2bWPW4DYyiQfa69A?nav=index.html|ChangeSet@-4w

The following (tested) patch gets DRM working on my i815, and makes
the same change to i830_drv.c.  I'm guessing that the changes are
obviously right or obviously wrong -- notice that I can't tell,
though. :-)

Eh:
Signed-Off-By: Joseph Fannin <jh...@ri...>


diff -aurN a/drivers/char/drm/i810_drv.c b/drivers/char/drm/i810_drv.c
--- a/drivers/char/drm/i810_drv.c	2004-11-26 23:18:35.000000000 -0500
+++ b/drivers/char/drm/i810_drv.c	2004-11-26 23:38:36.000000000 -0500
@@ -112,7 +112,7 @@
 		.open = drm_open,
 		.release = drm_release,
 		.ioctl = drm_ioctl,
-		.mmap = i810_mmap_buffers,
+		.mmap = drm_mmap,
 		.poll = drm_poll,
 		.fasync = drm_fasync,
 	},
diff -aurN a/drivers/char/drm/i830_drv.c b/drivers/char/drm/i830_drv.c
--- a/drivers/char/drm/i830_drv.c	2004-11-26 23:18:35.000000000 -0500
+++ b/drivers/char/drm/i830_drv.c	2004-11-26 23:41:40.000000000 -0500
@@ -121,7 +121,7 @@
 		.open = drm_open,
 		.release = drm_release,
 		.ioctl = drm_ioctl,
-		.mmap = i830_mmap_buffers,
+		.mmap = drm_mmap,
 		.poll = drm_poll,
 		.fasync = drm_fasync,
 	},

    
-- 
Joseph Fannin
jh...@ri...

"Bull in pure form is rare; there is usually some contamination by data."
    -- William Graves Perry Jr.