fix that last patch to initialize the MTRR when AGP available.

diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 55d6a15..d8a7d99 100644 (file)
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -480,14 +480,15 @@ static int __init drm_init( void )
                DRM(takedown)( dev );
                return -ENOMEM;
        }
+#endif
 #if __REALLY_HAVE_MTRR
-       dev->agp->agp_mtrr = mtrr_add( dev->agp->agp_info.aper_base,
+       if (dev->agp)
+               dev->agp->agp_mtrr = mtrr_add( dev->agp->agp_info.aper_base,
                                       dev->agp->agp_info.aper_size*1024*1024,
                                       MTRR_TYPE_WRCOMB,
                                       1 );
 #endif
 #endif
-#endif
 
 #if __HAVE_CTX_BITMAP
        retcode = DRM(ctxbitmap_init)( dev );

diff --git a/linux/drm_drv.h b/linux/drm_drv.h
index 55d6a15..d8a7d99 100644 (file)
--- a/linux/drm_drv.h
+++ b/linux/drm_drv.h
@@ -480,14 +480,15 @@ static int __init drm_init( void )
                DRM(takedown)( dev );
                return -ENOMEM;
        }
+#endif
 #if __REALLY_HAVE_MTRR
-       dev->agp->agp_mtrr = mtrr_add( dev->agp->agp_info.aper_base,
+       if (dev->agp)
+               dev->agp->agp_mtrr = mtrr_add( dev->agp->agp_info.aper_base,
                                       dev->agp->agp_info.aper_size*1024*1024,
                                       MTRR_TYPE_WRCOMB,
                                       1 );
 #endif
 #endif
-#endif
 
 #if __HAVE_CTX_BITMAP
        retcode = DRM(ctxbitmap_init)( dev );