diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2001-03-04 19:19:20 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2001-03-04 19:19:20 +0000 |
| commit | 8d3f3f4f9b8a5611888c35b7683661bcf52ef9cc (patch) | |
| tree | 7bd83758f000bf8b8cddb93071507d56f9d369e5 /linux-core/drm_drv.c | |
| parent | db03d12a8fe6c11029127831f1a9bf22056a250b (diff) | |
Don't try and setup the MTRR for AGP when AGP not available. Check
dev->agp, when agp_acquire called, and..... Uncomment MUST_HAVE_AGP
around agp_* calls, so that support for both agp/pci can happen in a
single kernel driver.
Diffstat (limited to 'linux-core/drm_drv.c')
| -rw-r--r-- | linux-core/drm_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index 71f52276..55d6a15d 100644 --- a/linux-core/drm_drv.c +++ b/linux-core/drm_drv.c @@ -480,7 +480,6 @@ 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, dev->agp->agp_info.aper_size*1024*1024, @@ -488,6 +487,7 @@ static int __init drm_init( void ) 1 ); #endif #endif +#endif #if __HAVE_CTX_BITMAP retcode = DRM(ctxbitmap_init)( dev ); |