From 8d3f3f4f9b8a5611888c35b7683661bcf52ef9cc Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Sun, 4 Mar 2001 19:19:20 +0000 Subject: 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. --- linux/drm_agpsupport.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux/drm_agpsupport.h') diff --git a/linux/drm_agpsupport.h b/linux/drm_agpsupport.h index b070a59e..dfd0d8fc 100644 --- a/linux/drm_agpsupport.h +++ b/linux/drm_agpsupport.h @@ -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; -- cgit v1.2.3