diff options
| author | Eric Anholt <anholt@freebsd.org> | 2003-03-11 20:51:28 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2003-03-11 20:51:28 +0000 |
| commit | 0bd0dd2300e91707ae5a41a83eb37217fd8ad295 (patch) | |
| tree | 55a4bdeef5e1bfadf163506449860d56ae1d0f51 | |
| parent | 638d45d2a0f5101e0b10a4f2761f9e25d2872055 (diff) | |
Merge back from FreeBSD-current, adding FreeBSD ID tags to aid futureX_4_3_0-20020324-preimport
merging. Also includes an update to radeon PCI IDs.
45 files changed, 135 insertions, 62 deletions
diff --git a/bsd-core/ati_pcigart.c b/bsd-core/ati_pcigart.c index ba0b81a7..0cc63a3a 100644 --- a/bsd-core/ati_pcigart.c +++ b/bsd-core/ati_pcigart.c @@ -25,6 +25,8 @@ * * Authors: * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/ati_pcigart.h,v 1.1 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h index 75b8fb92..d28af721 100644 --- a/bsd-core/drmP.h +++ b/bsd-core/drmP.h @@ -27,7 +27,7 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> - * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.2 2002/04/29 18:18:42 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.3 2003/03/09 02:08:28 anholt Exp $ */ #ifndef _DRM_P_H_ diff --git a/bsd-core/drm_agpsupport.c b/bsd-core/drm_agpsupport.c index 1414569d..ca7bea9e 100644 --- a/bsd-core/drm_agpsupport.c +++ b/bsd-core/drm_agpsupport.c @@ -27,6 +27,7 @@ * Author: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * $FreeBSD: src/sys/dev/drm/drm_agpsupport.h,v 1.2 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd-core/drm_auth.c b/bsd-core/drm_auth.c index a03cc918..c506ee7e 100644 --- a/bsd-core/drm_auth.c +++ b/bsd-core/drm_auth.c @@ -27,6 +27,7 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * $FreeBSD: src/sys/dev/drm/drm_auth.h,v 1.3 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd-core/drm_bufs.c b/bsd-core/drm_bufs.c index 89390b56..5df6f342 100644 --- a/bsd-core/drm_bufs.c +++ b/bsd-core/drm_bufs.c @@ -27,6 +27,7 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * $FreeBSD: src/sys/dev/drm/drm_bufs.h,v 1.4 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd-core/drm_context.c b/bsd-core/drm_context.c index ffabe661..c3a20f6e 100644 --- a/bsd-core/drm_context.c +++ b/bsd-core/drm_context.c @@ -27,6 +27,7 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * $FreeBSD: src/sys/dev/drm/drm_context.h,v 1.3 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd-core/drm_dma.c b/bsd-core/drm_dma.c index 231b3292..946e652c 100644 --- a/bsd-core/drm_dma.c +++ b/bsd-core/drm_dma.c @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_dma.h,v 1.4 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd-core/drm_drawable.c b/bsd-core/drm_drawable.c index 30841067..25dfc6d9 100644 --- a/bsd-core/drm_drawable.c +++ b/bsd-core/drm_drawable.c @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_drawable.h,v 1.2 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd-core/drm_drv.c b/bsd-core/drm_drv.c index 6b927a3b..d477a0f8 100644 --- a/bsd-core/drm_drv.c +++ b/bsd-core/drm_drv.c @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> * - * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.11 2003/03/03 12:48:14 phk Exp $ + * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.12 2003/03/09 02:08:28 anholt Exp $ */ /* diff --git a/bsd-core/drm_fops.c b/bsd-core/drm_fops.c index d2faaa43..75baa5f2 100644 --- a/bsd-core/drm_fops.c +++ b/bsd-core/drm_fops.c @@ -28,6 +28,8 @@ * Rickard E. (Rik) Faith <faith@valinux.com> * Daryll Strauss <daryll@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.5 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd-core/drm_ioctl.c b/bsd-core/drm_ioctl.c index b4770385..270b2bb5 100644 --- a/bsd-core/drm_ioctl.c +++ b/bsd-core/drm_ioctl.c @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_ioctl.h,v 1.3 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd-core/drm_lock.c b/bsd-core/drm_lock.c index bb99d9e6..6dd4f3c4 100644 --- a/bsd-core/drm_lock.c +++ b/bsd-core/drm_lock.c @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_lock.h,v 1.2 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd-core/drm_memory.c b/bsd-core/drm_memory.c index aa81363f..95d6110d 100644 --- a/bsd-core/drm_memory.c +++ b/bsd-core/drm_memory.c @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_memory.h,v 1.7 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" @@ -106,7 +108,8 @@ void DRM(mem_uninit)(void) #ifdef __FreeBSD__ /* drm_mem_info is called whenever a process reads /dev/drm/mem. */ -static int DRM(_mem_info)(drm_mem_stats_t *stats, struct sysctl_oid *oidp, void *arg1, +static int +DRM(_mem_info)(drm_mem_stats_t *stats, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req) { drm_mem_stats_t *pt; diff --git a/bsd-core/drm_os_freebsd.h b/bsd-core/drm_os_freebsd.h index c9a39287..227c9963 100644 --- a/bsd-core/drm_os_freebsd.h +++ b/bsd-core/drm_os_freebsd.h @@ -1,3 +1,6 @@ +/* + * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.8 2003/03/09 02:08:28 anholt Exp $ + */ #include <sys/param.h> #include <sys/queue.h> #include <sys/malloc.h> diff --git a/bsd-core/drm_scatter.c b/bsd-core/drm_scatter.c index f639b697..e57e5e5b 100644 --- a/bsd-core/drm_scatter.c +++ b/bsd-core/drm_scatter.c @@ -25,6 +25,8 @@ * * Authors: * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_scatter.h,v 1.4 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd-core/drm_sysctl.c b/bsd-core/drm_sysctl.c index 7cb5be22..627b78c9 100644 --- a/bsd-core/drm_sysctl.c +++ b/bsd-core/drm_sysctl.c @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/drm/drm_sysctl.h,v 1.1 2002/04/27 20:47:57 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_sysctl.h,v 1.2 2003/03/09 02:08:28 anholt Exp $ */ #ifdef __FreeBSD__ diff --git a/bsd-core/drm_vm.c b/bsd-core/drm_vm.c index ab356366..1ce0efab 100644 --- a/bsd-core/drm_vm.c +++ b/bsd-core/drm_vm.c @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/drm/drm_vm.h,v 1.3 2003/02/25 03:21:19 mux Exp $ + * $FreeBSD: src/sys/dev/drm/drm_vm.h,v 1.4 2003/03/09 02:08:28 anholt Exp $ */ #if defined(__FreeBSD__) && __FreeBSD_version >= 500102 diff --git a/bsd-core/mga_drv.c b/bsd-core/mga_drv.c index ffc83db9..de0387f7 100644 --- a/bsd-core/mga_drv.c +++ b/bsd-core/mga_drv.c @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/mga_drv.c,v 1.4 2003/03/09 02:08:28 anholt Exp $ */ #include "mga.h" diff --git a/bsd-core/r128_drv.c b/bsd-core/r128_drv.c index 8a9c2837..28a2c85e 100644 --- a/bsd-core/r128_drv.c +++ b/bsd-core/r128_drv.c @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/r128_drv.c,v 1.4 2003/03/09 02:08:28 anholt Exp $ */ #include "r128.h" diff --git a/bsd-core/radeon_drv.c b/bsd-core/radeon_drv.c index 79c982e3..2e7c5d66 100644 --- a/bsd-core/radeon_drv.c +++ b/bsd-core/radeon_drv.c @@ -25,6 +25,8 @@ * * Authors: * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/radeon_drv.c,v 1.5 2003/03/11 01:38:17 anholt Exp $ */ #include "radeon.h" @@ -37,39 +39,41 @@ #endif drm_chipinfo_t DRM(devicelist)[] = { - {0x1002, 0x4242, 1, "ATI Radeon BB AIW 8500DV (AGP)"}, - {0x1002, 0x4336, 1, "ATI Radeon Mobility"}, - {0x1002, 0x4337, 1, "ATI Radeon IGP 340"}, - {0x1002, 0x4964, 1, "ATI Radeon Id 9000"}, - {0x1002, 0x4965, 1, "ATI Radeon Ie 9000"}, - {0x1002, 0x4966, 1, "ATI Radeon If 9000"}, - {0x1002, 0x4967, 1, "ATI Radeon Ig 9000"}, - {0x1002, 0x496e, 1, "ATI Radeon Ig 9000"}, - {0x1002, 0x4C57, 1, "ATI Radeon LW Mobility 7 (AGP)"}, - {0x1002, 0x4C58, 1, "ATI Radeon LX Mobility 7 (AGP)"}, - {0x1002, 0x4C59, 1, "ATI Radeon LY Mobility 6 (AGP)"}, - {0x1002, 0x4C5A, 1, "ATI Radeon LZ Mobility 6 (AGP)"}, - {0x1002, 0x4C64, 1, "ATI Radeon Ld Mobility 9000 (AGP)"}, - {0x1002, 0x4C65, 1, "ATI Radeon Le Mobility 9000 (AGP)"}, - {0x1002, 0x4C66, 1, "ATI Radeon Lf Mobility 9000 (AGP)"}, - {0x1002, 0x4C67, 1, "ATI Radeon Lg Mobility 9000 (AGP)"}, - {0x1002, 0x5144, 1, "ATI Radeon QD R100 (AGP)"}, - {0x1002, 0x5145, 1, "ATI Radeon QE R100 (AGP)"}, - {0x1002, 0x5146, 1, "ATI Radeon QF R100 (AGP)"}, - {0x1002, 0x5147, 1, "ATI Radeon QG R100 (AGP)"}, - {0x1002, 0x5148, 1, "ATI Radeon QH FireGL 8x00 (AGP)"}, + {0x1002, 0x4242, 1, "ATI Radeon BB R200 AIW 8500DV"}, + {0x1002, 0x4336, 1, "ATI Radeon Mobility U1"}, + {0x1002, 0x4964, 1, "ATI Radeon Id R250 9000"}, + {0x1002, 0x4965, 1, "ATI Radeon Ie R250 9000"}, + {0x1002, 0x4966, 1, "ATI Radeon If R250 9000"}, + {0x1002, 0x4967, 1, "ATI Radeon Ig R250 9000"}, + {0x1002, 0x4C57, 1, "ATI Radeon LW Mobility 7500 M7"}, + {0x1002, 0x4C58, 1, "ATI Radeon LX RV200 Mobility FireGL 7800 M7"}, + {0x1002, 0x4C59, 1, "ATI Radeon LY Mobility M6"}, + {0x1002, 0x4C5A, 1, "ATI Radeon LZ Mobility M6"}, + {0x1002, 0x4C64, 1, "ATI Radeon Ld R250 Mobility 9000 M9"}, + {0x1002, 0x4C65, 1, "ATI Radeon Le R250 Mobility 9000 M9"}, + {0x1002, 0x4C66, 1, "ATI Radeon Lf R250 Mobility 9000 M9"}, + {0x1002, 0x4C67, 1, "ATI Radeon Lg R250 Mobility 9000 M9"}, + {0x1002, 0x5144, 1, "ATI Radeon QD R100"}, + {0x1002, 0x5145, 1, "ATI Radeon QE R100"}, + {0x1002, 0x5146, 1, "ATI Radeon QF R100"}, + {0x1002, 0x5147, 1, "ATI Radeon QG R100"}, + {0x1002, 0x5148, 1, "ATI Radeon QH FireGL 8x00"}, {0x1002, 0x5149, 1, "ATI Radeon QI R200"}, {0x1002, 0x514A, 1, "ATI Radeon QJ R200"}, {0x1002, 0x514B, 1, "ATI Radeon QK R200"}, - {0x1002, 0x514C, 1, "ATI Radeon QL 8500 (AGP)"}, - {0x1002, 0x5157, 1, "ATI Radeon QW 7500 (AGP)"}, - {0x1002, 0x5158, 1, "ATI Radeon QX 7500 (AGP)"}, - {0x1002, 0x5159, 1, "ATI Radeon QY VE (AGP)"}, - {0x1002, 0x515A, 1, "ATI Radeon QZ VE (AGP)"}, + {0x1002, 0x514C, 1, "ATI Radeon QL R200 8500 LE"}, + {0x1002, 0x514D, 1, "ATI Radeon QM R200 9100"}, + {0x1002, 0x514E, 1, "ATI Radeon QN R200 8500 LE"}, + {0x1002, 0x514F, 1, "ATI Radeon QO R200 8500 LE"}, + {0x1002, 0x5157, 1, "ATI Radeon QW RV200 7500"}, + {0x1002, 0x5158, 1, "ATI Radeon QX RV200 7500"}, + {0x1002, 0x5159, 1, "ATI Radeon QY RV100 VE"}, + {0x1002, 0x515A, 1, "ATI Radeon QZ RV100 VE"}, {0x1002, 0x5168, 1, "ATI Radeon Qh R200"}, {0x1002, 0x5169, 1, "ATI Radeon Qi R200"}, {0x1002, 0x516A, 1, "ATI Radeon Qj R200"}, {0x1002, 0x516B, 1, "ATI Radeon Qk R200"}, + {0x1002, 0x516C, 1, "ATI Radeon Ql R200"}, {0, 0, 0, NULL} }; diff --git a/bsd-core/tdfx_drv.c b/bsd-core/tdfx_drv.c index c62ca2c5..e10542f1 100644 --- a/bsd-core/tdfx_drv.c +++ b/bsd-core/tdfx_drv.c @@ -28,6 +28,8 @@ * Rickard E. (Rik) Faith <faith@valinux.com> * Daryll Strauss <daryll@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/tdfx_drv.c,v 1.3 2003/03/09 02:08:28 anholt Exp $ */ #include "tdfx.h" diff --git a/bsd/ati_pcigart.h b/bsd/ati_pcigart.h index ba0b81a7..0cc63a3a 100644 --- a/bsd/ati_pcigart.h +++ b/bsd/ati_pcigart.h @@ -25,6 +25,8 @@ * * Authors: * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/ati_pcigart.h,v 1.1 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" @@ -30,6 +30,7 @@ * Acknowledgements: * Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg. * + * $FreeBSD: src/sys/dev/drm/drm.h,v 1.3 2003/03/09 02:08:28 anholt Exp $ */ #ifndef _DRM_H_ @@ -27,7 +27,7 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> - * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.2 2002/04/29 18:18:42 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.3 2003/03/09 02:08:28 anholt Exp $ */ #ifndef _DRM_P_H_ diff --git a/bsd/drm_agpsupport.h b/bsd/drm_agpsupport.h index 1414569d..ca7bea9e 100644 --- a/bsd/drm_agpsupport.h +++ b/bsd/drm_agpsupport.h @@ -27,6 +27,7 @@ * Author: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * $FreeBSD: src/sys/dev/drm/drm_agpsupport.h,v 1.2 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_auth.h b/bsd/drm_auth.h index a03cc918..c506ee7e 100644 --- a/bsd/drm_auth.h +++ b/bsd/drm_auth.h @@ -27,6 +27,7 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * $FreeBSD: src/sys/dev/drm/drm_auth.h,v 1.3 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_bufs.h b/bsd/drm_bufs.h index 89390b56..5df6f342 100644 --- a/bsd/drm_bufs.h +++ b/bsd/drm_bufs.h @@ -27,6 +27,7 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * $FreeBSD: src/sys/dev/drm/drm_bufs.h,v 1.4 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_context.h b/bsd/drm_context.h index ffabe661..c3a20f6e 100644 --- a/bsd/drm_context.h +++ b/bsd/drm_context.h @@ -27,6 +27,7 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * $FreeBSD: src/sys/dev/drm/drm_context.h,v 1.3 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_dma.h b/bsd/drm_dma.h index 231b3292..946e652c 100644 --- a/bsd/drm_dma.h +++ b/bsd/drm_dma.h @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_dma.h,v 1.4 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_drawable.h b/bsd/drm_drawable.h index 30841067..25dfc6d9 100644 --- a/bsd/drm_drawable.h +++ b/bsd/drm_drawable.h @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_drawable.h,v 1.2 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_drv.h b/bsd/drm_drv.h index 6b927a3b..d477a0f8 100644 --- a/bsd/drm_drv.h +++ b/bsd/drm_drv.h @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> * - * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.11 2003/03/03 12:48:14 phk Exp $ + * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.12 2003/03/09 02:08:28 anholt Exp $ */ /* diff --git a/bsd/drm_fops.h b/bsd/drm_fops.h index d2faaa43..75baa5f2 100644 --- a/bsd/drm_fops.h +++ b/bsd/drm_fops.h @@ -28,6 +28,8 @@ * Rickard E. (Rik) Faith <faith@valinux.com> * Daryll Strauss <daryll@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.5 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_init.h b/bsd/drm_init.h index adf421a4..ec9ea1d7 100644 --- a/bsd/drm_init.h +++ b/bsd/drm_init.h @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_init.h,v 1.2 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_ioctl.h b/bsd/drm_ioctl.h index b4770385..270b2bb5 100644 --- a/bsd/drm_ioctl.h +++ b/bsd/drm_ioctl.h @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_ioctl.h,v 1.3 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_lists.h b/bsd/drm_lists.h index 578a99a3..8c34e117 100644 --- a/bsd/drm_lists.h +++ b/bsd/drm_lists.h @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_lists.h,v 1.3 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_lock.h b/bsd/drm_lock.h index bb99d9e6..6dd4f3c4 100644 --- a/bsd/drm_lock.h +++ b/bsd/drm_lock.h @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_lock.h,v 1.2 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_memory.h b/bsd/drm_memory.h index aa81363f..95d6110d 100644 --- a/bsd/drm_memory.h +++ b/bsd/drm_memory.h @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_memory.h,v 1.7 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" @@ -106,7 +108,8 @@ void DRM(mem_uninit)(void) #ifdef __FreeBSD__ /* drm_mem_info is called whenever a process reads /dev/drm/mem. */ -static int DRM(_mem_info)(drm_mem_stats_t *stats, struct sysctl_oid *oidp, void *arg1, +static int +DRM(_mem_info)(drm_mem_stats_t *stats, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req) { drm_mem_stats_t *pt; diff --git a/bsd/drm_os_freebsd.h b/bsd/drm_os_freebsd.h index c9a39287..227c9963 100644 --- a/bsd/drm_os_freebsd.h +++ b/bsd/drm_os_freebsd.h @@ -1,3 +1,6 @@ +/* + * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.8 2003/03/09 02:08:28 anholt Exp $ + */ #include <sys/param.h> #include <sys/queue.h> #include <sys/malloc.h> diff --git a/bsd/drm_scatter.h b/bsd/drm_scatter.h index f639b697..e57e5e5b 100644 --- a/bsd/drm_scatter.h +++ b/bsd/drm_scatter.h @@ -25,6 +25,8 @@ * * Authors: * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_scatter.h,v 1.4 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_sysctl.h b/bsd/drm_sysctl.h index 7cb5be22..627b78c9 100644 --- a/bsd/drm_sysctl.h +++ b/bsd/drm_sysctl.h @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/drm/drm_sysctl.h,v 1.1 2002/04/27 20:47:57 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_sysctl.h,v 1.2 2003/03/09 02:08:28 anholt Exp $ */ #ifdef __FreeBSD__ diff --git a/bsd/drm_vm.h b/bsd/drm_vm.h index ab356366..1ce0efab 100644 --- a/bsd/drm_vm.h +++ b/bsd/drm_vm.h @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/drm/drm_vm.h,v 1.3 2003/02/25 03:21:19 mux Exp $ + * $FreeBSD: src/sys/dev/drm/drm_vm.h,v 1.4 2003/03/09 02:08:28 anholt Exp $ */ #if defined(__FreeBSD__) && __FreeBSD_version >= 500102 diff --git a/bsd/mga_drv.c b/bsd/mga_drv.c index ffc83db9..de0387f7 100644 --- a/bsd/mga_drv.c +++ b/bsd/mga_drv.c @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/mga_drv.c,v 1.4 2003/03/09 02:08:28 anholt Exp $ */ #include "mga.h" diff --git a/bsd/r128_drv.c b/bsd/r128_drv.c index 8a9c2837..28a2c85e 100644 --- a/bsd/r128_drv.c +++ b/bsd/r128_drv.c @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/r128_drv.c,v 1.4 2003/03/09 02:08:28 anholt Exp $ */ #include "r128.h" diff --git a/bsd/radeon_drv.c b/bsd/radeon_drv.c index 79c982e3..2e7c5d66 100644 --- a/bsd/radeon_drv.c +++ b/bsd/radeon_drv.c @@ -25,6 +25,8 @@ * * Authors: * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/radeon_drv.c,v 1.5 2003/03/11 01:38:17 anholt Exp $ */ #include "radeon.h" @@ -37,39 +39,41 @@ #endif drm_chipinfo_t DRM(devicelist)[] = { - {0x1002, 0x4242, 1, "ATI Radeon BB AIW 8500DV (AGP)"}, - {0x1002, 0x4336, 1, "ATI Radeon Mobility"}, - {0x1002, 0x4337, 1, "ATI Radeon IGP 340"}, - {0x1002, 0x4964, 1, "ATI Radeon Id 9000"}, - {0x1002, 0x4965, 1, "ATI Radeon Ie 9000"}, - {0x1002, 0x4966, 1, "ATI Radeon If 9000"}, - {0x1002, 0x4967, 1, "ATI Radeon Ig 9000"}, - {0x1002, 0x496e, 1, "ATI Radeon Ig 9000"}, - {0x1002, 0x4C57, 1, "ATI Radeon LW Mobility 7 (AGP)"}, - {0x1002, 0x4C58, 1, "ATI Radeon LX Mobility 7 (AGP)"}, - {0x1002, 0x4C59, 1, "ATI Radeon LY Mobility 6 (AGP)"}, - {0x1002, 0x4C5A, 1, "ATI Radeon LZ Mobility 6 (AGP)"}, - {0x1002, 0x4C64, 1, "ATI Radeon Ld Mobility 9000 (AGP)"}, - {0x1002, 0x4C65, 1, "ATI Radeon Le Mobility 9000 (AGP)"}, - {0x1002, 0x4C66, 1, "ATI Radeon Lf Mobility 9000 (AGP)"}, - {0x1002, 0x4C67, 1, "ATI Radeon Lg Mobility 9000 (AGP)"}, - {0x1002, 0x5144, 1, "ATI Radeon QD R100 (AGP)"}, - {0x1002, 0x5145, 1, "ATI Radeon QE R100 (AGP)"}, - {0x1002, 0x5146, 1, "ATI Radeon QF R100 (AGP)"}, - {0x1002, 0x5147, 1, "ATI Radeon QG R100 (AGP)"}, - {0x1002, 0x5148, 1, "ATI Radeon QH FireGL 8x00 (AGP)"}, + {0x1002, 0x4242, 1, "ATI Radeon BB R200 AIW 8500DV"}, + {0x1002, 0x4336, 1, "ATI Radeon Mobility U1"}, + {0x1002, 0x4964, 1, "ATI Radeon Id R250 9000"}, + {0x1002, 0x4965, 1, "ATI Radeon Ie R250 9000"}, + {0x1002, 0x4966, 1, "ATI Radeon If R250 9000"}, + {0x1002, 0x4967, 1, "ATI Radeon Ig R250 9000"}, + {0x1002, 0x4C57, 1, "ATI Radeon LW Mobility 7500 M7"}, + {0x1002, 0x4C58, 1, "ATI Radeon LX RV200 Mobility FireGL 7800 M7"}, + {0x1002, 0x4C59, 1, "ATI Radeon LY Mobility M6"}, + {0x1002, 0x4C5A, 1, "ATI Radeon LZ Mobility M6"}, + {0x1002, 0x4C64, 1, "ATI Radeon Ld R250 Mobility 9000 M9"}, + {0x1002, 0x4C65, 1, "ATI Radeon Le R250 Mobility 9000 M9"}, + {0x1002, 0x4C66, 1, "ATI Radeon Lf R250 Mobility 9000 M9"}, + {0x1002, 0x4C67, 1, "ATI Radeon Lg R250 Mobility 9000 M9"}, + {0x1002, 0x5144, 1, "ATI Radeon QD R100"}, + {0x1002, 0x5145, 1, "ATI Radeon QE R100"}, + {0x1002, 0x5146, 1, "ATI Radeon QF R100"}, + {0x1002, 0x5147, 1, "ATI Radeon QG R100"}, + {0x1002, 0x5148, 1, "ATI Radeon QH FireGL 8x00"}, {0x1002, 0x5149, 1, "ATI Radeon QI R200"}, {0x1002, 0x514A, 1, "ATI Radeon QJ R200"}, {0x1002, 0x514B, 1, "ATI Radeon QK R200"}, - {0x1002, 0x514C, 1, "ATI Radeon QL 8500 (AGP)"}, - {0x1002, 0x5157, 1, "ATI Radeon QW 7500 (AGP)"}, - {0x1002, 0x5158, 1, "ATI Radeon QX 7500 (AGP)"}, - {0x1002, 0x5159, 1, "ATI Radeon QY VE (AGP)"}, - {0x1002, 0x515A, 1, "ATI Radeon QZ VE (AGP)"}, + {0x1002, 0x514C, 1, "ATI Radeon QL R200 8500 LE"}, + {0x1002, 0x514D, 1, "ATI Radeon QM R200 9100"}, + {0x1002, 0x514E, 1, "ATI Radeon QN R200 8500 LE"}, + {0x1002, 0x514F, 1, "ATI Radeon QO R200 8500 LE"}, + {0x1002, 0x5157, 1, "ATI Radeon QW RV200 7500"}, + {0x1002, 0x5158, 1, "ATI Radeon QX RV200 7500"}, + {0x1002, 0x5159, 1, "ATI Radeon QY RV100 VE"}, + {0x1002, 0x515A, 1, "ATI Radeon QZ RV100 VE"}, {0x1002, 0x5168, 1, "ATI Radeon Qh R200"}, {0x1002, 0x5169, 1, "ATI Radeon Qi R200"}, {0x1002, 0x516A, 1, "ATI Radeon Qj R200"}, {0x1002, 0x516B, 1, "ATI Radeon Qk R200"}, + {0x1002, 0x516C, 1, "ATI Radeon Ql R200"}, {0, 0, 0, NULL} }; diff --git a/bsd/tdfx_drv.c b/bsd/tdfx_drv.c index c62ca2c5..e10542f1 100644 --- a/bsd/tdfx_drv.c +++ b/bsd/tdfx_drv.c @@ -28,6 +28,8 @@ * Rickard E. (Rik) Faith <faith@valinux.com> * Daryll Strauss <daryll@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/tdfx_drv.c,v 1.3 2003/03/09 02:08:28 anholt Exp $ */ #include "tdfx.h" |