diff options
author | anholt <anholt@FreeBSD.org> | 2004-06-11 03:26:59 +0000 |
---|---|---|
committer | anholt <anholt@FreeBSD.org> | 2004-06-11 03:26:59 +0000 |
commit | be5dc242b6a2d2549e38e77baf82adb7b33b042b (patch) | |
tree | dc68be4b837d82c81a81bb2cec14ded275766e76 /sys/dev/drm/mga.h | |
parent | da6e1707d47446b0f3de71fd5a924233a2168f65 (diff) | |
download | FreeBSD-src-be5dc242b6a2d2549e38e77baf82adb7b33b042b.zip FreeBSD-src-be5dc242b6a2d2549e38e77baf82adb7b33b042b.tar.gz |
Merge from DRI CVS as of 2004-05-26. Most of the meat is new PCI IDs and a new
packet for Radeon.
Diffstat (limited to 'sys/dev/drm/mga.h')
-rw-r--r-- | sys/dev/drm/mga.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/drm/mga.h b/sys/dev/drm/mga.h index a9dd031..74a98ac 100644 --- a/sys/dev/drm/mga.h +++ b/sys/dev/drm/mga.h @@ -66,12 +66,6 @@ [DRM_IOCTL_NR(DRM_IOCTL_MGA_BLIT)] = { mga_dma_blit, 1, 0 }, \ [DRM_IOCTL_NR(DRM_IOCTL_MGA_GETPARAM)]= { mga_getparam, 1, 0 }, -#define DRIVER_PCI_IDS \ - {0x102b, 0x0521, 0, "Matrox G200 (AGP)"}, \ - {0x102b, 0x0525, 0, "Matrox G400/G450 (AGP)"}, \ - {0x102b, 0x2527, 0, "Matrox G550 (AGP)"}, \ - {0, 0, 0, NULL} - #define __HAVE_COUNTERS 3 #define __HAVE_COUNTER6 _DRM_STAT_IRQ #define __HAVE_COUNTER7 _DRM_STAT_PRIMARY @@ -79,7 +73,7 @@ /* Driver customization: */ -#define DRIVER_PRETAKEDOWN() do { \ +#define DRIVER_PRETAKEDOWN( dev ) do { \ mga_do_cleanup_dma( dev ); \ } while (0) |