summaryrefslogtreecommitdiffstats
path: root/sys/dev/drm/mga_drv.c
diff options
context:
space:
mode:
authoranholt <anholt@FreeBSD.org>2006-05-17 06:36:28 +0000
committeranholt <anholt@FreeBSD.org>2006-05-17 06:36:28 +0000
commitc0e3faf72685e6c02e8509c92408f672e27c7096 (patch)
tree208614304ffab07c6036af66afbe1dfd0327faae /sys/dev/drm/mga_drv.c
parent1e618fb39747a281fe2964d37909e16ae0dfff6e (diff)
downloadFreeBSD-src-c0e3faf72685e6c02e8509c92408f672e27c7096.zip
FreeBSD-src-c0e3faf72685e6c02e8509c92408f672e27c7096.tar.gz
Update to current DRM CVS, bringing in a fix for a NULL pointer chase when
running 3d apps on i915.
Diffstat (limited to 'sys/dev/drm/mga_drv.c')
-rw-r--r--sys/dev/drm/mga_drv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/drm/mga_drv.c b/sys/dev/drm/mga_drv.c
index 7250043..8bde4fd 100644
--- a/sys/dev/drm/mga_drv.c
+++ b/sys/dev/drm/mga_drv.c
@@ -82,9 +82,9 @@ static int mga_driver_device_is_agp(drm_device_t * dev)
if (pci_get_device(dev->device) == 0x0525 &&
pci_get_vendor(bus) == 0x3388 &&
pci_get_device(bus) == 0x0021)
- return 0;
+ return DRM_IS_NOT_AGP;
else
- return 2;
+ return DRM_MIGHT_BE_AGP;
}
static void mga_configure(drm_device_t *dev)
OpenPOWER on IntegriCloud