From d1774bb44cdc1b5ce606c299b8eea1793f4352e3 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Mon, 5 Mar 2001 15:52:11 +0000 Subject: [PATCH] fix that last patch to initialize the MTRR when AGP available. --- linux-core/drm_drv.c | 5 +++-- linux/drm_drv.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index 55d6a15..d8a7d99 100644 --- 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 --- 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 ); -- 2.7.4