--- ./src/mesa/drivers/dri/radeon/radeon_screen.c.r300_PCIE	2006-08-18 23:52:47.000000000 +0200
+++ ./src/mesa/drivers/dri/radeon/radeon_screen.c	2006-08-18 23:53:06.000000000 +0200
@@ -343,7 +343,6 @@
 	 return NULL;
       }
 
-      if (sPriv->drmMinor >= 6) {
 	 gp.param = RADEON_PARAM_GART_BASE;
 	 gp.value = &screen->gart_base;
 
@@ -372,7 +371,6 @@
 	 screen->drmSupportsPointSprites = (sPriv->drmMinor >= 13);
 	 screen->drmSupportsCubeMapsR100 = (sPriv->drmMinor >= 15);
       }
-   }
 
    screen->mmio.handle = dri_priv->registerHandle;
    screen->mmio.size   = dri_priv->registerSize;
@@ -425,9 +423,7 @@
 	 return NULL;
       }
 
-      screen->gart_texture_offset = dri_priv->gartTexOffset + ( screen->IsPCI
-		? INREG( RADEON_AIC_LO_ADDR )
-		: ( ( INREG( RADEON_MC_AGP_LOCATION ) & 0x0ffffU ) << 16 ) );
+      screen->gart_texture_offset = dri_priv->gartTexOffset + screen->gart_base;
    }
 
    screen->chip_flags = 0;
@@ -976,12 +972,12 @@
    static const char *driver_name = "Radeon";
    static const __DRIutilversion2 ddx_expected = { 4, 5, 0, 0 };
    static const __DRIversion dri_expected = { 4, 0, 0 };
-   static const __DRIversion drm_expected = { 1, 3, 0 };
+   static const __DRIversion drm_expected = { 1, 6, 0 };
 #elif RADEON_COMMON && defined(RADEON_COMMON_FOR_R200)
    static const char *driver_name = "R200";
    static const __DRIutilversion2 ddx_expected = { 4, 5, 0, 0 };
    static const __DRIversion dri_expected = { 4, 0, 0 };
-   static const __DRIversion drm_expected = { 1, 5, 0 };
+   static const __DRIversion drm_expected = { 1, 6, 0 };
 #elif RADEON_COMMON && defined(RADEON_COMMON_FOR_R300)
    static const char *driver_name = "R300";
    static const __DRIutilversion2 ddx_expected = { 4, 5, 0, 0 };