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

main
Alan Hourihane 2001-03-05 15:52:11 +00:00
parent 8d3f3f4f9b
commit d1774bb44c
2 changed files with 6 additions and 4 deletions

View File

@ -480,14 +480,15 @@ static int __init drm_init( void )
DRM(takedown)( dev ); DRM(takedown)( dev );
return -ENOMEM; return -ENOMEM;
} }
#endif
#if __REALLY_HAVE_MTRR #if __REALLY_HAVE_MTRR
if (dev->agp)
dev->agp->agp_mtrr = mtrr_add( dev->agp->agp_info.aper_base, dev->agp->agp_mtrr = mtrr_add( dev->agp->agp_info.aper_base,
dev->agp->agp_info.aper_size*1024*1024, dev->agp->agp_info.aper_size*1024*1024,
MTRR_TYPE_WRCOMB, MTRR_TYPE_WRCOMB,
1 ); 1 );
#endif #endif
#endif #endif
#endif
#if __HAVE_CTX_BITMAP #if __HAVE_CTX_BITMAP
retcode = DRM(ctxbitmap_init)( dev ); retcode = DRM(ctxbitmap_init)( dev );

View File

@ -480,14 +480,15 @@ static int __init drm_init( void )
DRM(takedown)( dev ); DRM(takedown)( dev );
return -ENOMEM; return -ENOMEM;
} }
#endif
#if __REALLY_HAVE_MTRR #if __REALLY_HAVE_MTRR
if (dev->agp)
dev->agp->agp_mtrr = mtrr_add( dev->agp->agp_info.aper_base, dev->agp->agp_mtrr = mtrr_add( dev->agp->agp_info.aper_base,
dev->agp->agp_info.aper_size*1024*1024, dev->agp->agp_info.aper_size*1024*1024,
MTRR_TYPE_WRCOMB, MTRR_TYPE_WRCOMB,
1 ); 1 );
#endif #endif
#endif #endif
#endif
#if __HAVE_CTX_BITMAP #if __HAVE_CTX_BITMAP
retcode = DRM(ctxbitmap_init)( dev ); retcode = DRM(ctxbitmap_init)( dev );