Lots of DRM fixes: added new pieces of template code so the ffb driver can be ported, rolled back r128 and i810 version bumps so 4.1.0 works with cvs kernel modules, added Config.in and updated Makefile.kernel, incorporated lots of drm fixes inspired by patches sent by Redhat, made DRM(realloc) usage check for NULL allocations, restructure driver init routines to export dev_priv only when initialized and to check for all error conditions.

2 files changed, 6 insertions, 6 deletions

diff --git a/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c b/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c
index 54a561a01..324e9c2ff 100644
--- a/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c
+++ b/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c
@@ -154,10 +154,10 @@ GLboolean XMesaInitDriver(__DRIscreenPrivate *sPriv)
    }
 
    /* Check that the DRM driver version is compatible */
-   if (sPriv->drmMajor != 2 ||
-       sPriv->drmMinor < 0) {
+   if (sPriv->drmMajor != 1 ||
+       sPriv->drmMinor < 1) {
       char msg[1000];
-      sprintf(msg, "i810 DRI driver expected DRM driver version 2.x but got version %d.%d.%d", sPriv->drmMajor, sPriv->drmMinor, sPriv->drmPatch);
+      sprintf(msg, "i810 DRI driver expected DRM driver version 1.1 or greater but got version %d.%d.%d", sPriv->drmMajor, sPriv->drmMinor, sPriv->drmPatch);
       __driMesaMessage(msg);
       return GL_FALSE;
    }
diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c b/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c
index bab1ed81b..065b65999 100644
--- a/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c
+++ b/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c
@@ -80,10 +80,10 @@ GLboolean XMesaInitDriver( __DRIscreenPrivate *sPriv )
    }
 
    /* Check that the DRM driver version is compatible */
-   if ( sPriv->drmMajor != 3 ||
-	sPriv->drmMinor < 0 ) {
+   if ( sPriv->drmMajor != 2 ||
+	sPriv->drmMinor < 1 ) {
       char msg[1000];
-      sprintf( msg, "R128 DRI driver expected DRM driver version 3.x but got version %d.%d.%d", sPriv->drmMajor, sPriv->drmMinor, sPriv->drmPatch );
+      sprintf( msg, "R128 DRI driver expected DRM driver version 2.1 or greater but got version %d.%d.%d", sPriv->drmMajor, sPriv->drmMinor, sPriv->drmPatch );
       __driMesaMessage( msg );
       return GL_FALSE;
    }