geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
main
Alan Hourihane 2001-03-04 19:19:20 +00:00
parent db03d12a8f
commit 8d3f3f4f9b
6 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-core/drm_agpsupport.c
View File

@ -77,7 +77,7 @@ int DRM(agp_acquire)(struct inode *inode, struct file *filp,
drm_device_t *dev = priv->dev;
int retcode;
if (dev->agp->acquired || !drm_agp->acquire) return -EINVAL;
if (!dev->agp|| dev->agp->acquired || !drm_agp->acquire) return -EINVAL;
if ((retcode = drm_agp->acquire())) return retcode;
dev->agp->acquired = 1;
return 0;

2
linux-core/drm_drv.c
View File

@ -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 );

2
linux-core/drm_memory.h
View File

@ -352,7 +352,6 @@ void DRM(ioremapfree)(void *pt, unsigned long size)
}
#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
#if __MUST_HAVE_AGP
agp_memory *DRM(alloc_agp)(int pages, u32 type)
{
@ -456,5 +455,4 @@ int DRM(unbind_agp)(agp_memory *handle)
}
return retcode;
}
#endif
#endif /* defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) */

2
linux/drm_agpsupport.h
View File

@ -77,7 +77,7 @@ int DRM(agp_acquire)(struct inode *inode, struct file *filp,
drm_device_t *dev = priv->dev;
int retcode;
if (dev->agp->acquired || !drm_agp->acquire) return -EINVAL;
if (!dev->agp|| dev->agp->acquired || !drm_agp->acquire) return -EINVAL;
if ((retcode = drm_agp->acquire())) return retcode;
dev->agp->acquired = 1;
return 0;

2
linux/drm_drv.h
View File

@ -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 );

2
linux/drm_memory.h
View File

@ -352,7 +352,6 @@ void DRM(ioremapfree)(void *pt, unsigned long size)
}
#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
#if __MUST_HAVE_AGP
agp_memory *DRM(alloc_agp)(int pages, u32 type)
{
@ -456,5 +455,4 @@ int DRM(unbind_agp)(agp_memory *handle)
}
return retcode;
}
#endif
#endif /* defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) */