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_agpsupport.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_agpsupport.c')
-rw-r--r-- | linux-core/drm_agpsupport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_agpsupport.c b/linux-core/drm_agpsupport.c index b070a59e..dfd0d8fc 100644 --- a/linux-core/drm_agpsupport.c +++ b/linux-core/drm_agpsupport.c @@ -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; |