From 77ee73f8cd92aa136488e23424282afba9977160 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 25 Apr 2003 02:27:21 +0000 Subject: Merge from FreeBSD-current. --- bsd/drmP.h | 2 +- bsd/drm_bufs.h | 2 +- bsd/drm_context.h | 2 +- bsd/drm_dma.h | 2 +- bsd/drm_drv.h | 2 +- bsd/drm_fops.h | 6 +++--- bsd/drm_ioctl.h | 2 +- bsd/drm_lock.h | 2 +- bsd/drm_memory.h | 2 +- bsd/drm_os_freebsd.h | 2 +- bsd/drm_sysctl.h | 2 +- bsd/drm_vm.h | 6 +++--- bsd/mga_drv.c | 2 +- bsd/r128_drv.c | 2 +- bsd/radeon_drv.c | 2 +- bsd/tdfx.h | 2 ++ bsd/tdfx_drv.c | 2 +- 17 files changed, 22 insertions(+), 20 deletions(-) (limited to 'bsd') diff --git a/bsd/drmP.h b/bsd/drmP.h index 28594f76..8c970ff9 100644 --- a/bsd/drmP.h +++ b/bsd/drmP.h @@ -27,7 +27,7 @@ * Authors: * Rickard E. (Rik) Faith * Gareth Hughes - * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.3 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.4 2003/04/25 01:18:46 anholt Exp $ */ #ifndef _DRM_P_H_ diff --git a/bsd/drm_bufs.h b/bsd/drm_bufs.h index 9a815f00..f792140e 100644 --- a/bsd/drm_bufs.h +++ b/bsd/drm_bufs.h @@ -27,7 +27,7 @@ * Authors: * Rickard E. (Rik) Faith * Gareth Hughes - * $FreeBSD: src/sys/dev/drm/drm_bufs.h,v 1.4 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_bufs.h,v 1.5 2003/04/25 01:18:46 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_context.h b/bsd/drm_context.h index dabf5ca9..d1a021a6 100644 --- a/bsd/drm_context.h +++ b/bsd/drm_context.h @@ -27,7 +27,7 @@ * Authors: * Rickard E. (Rik) Faith * Gareth Hughes - * $FreeBSD: src/sys/dev/drm/drm_context.h,v 1.3 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_context.h,v 1.4 2003/04/25 01:18:46 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_dma.h b/bsd/drm_dma.h index 238dca3e..4ddf8b22 100644 --- a/bsd/drm_dma.h +++ b/bsd/drm_dma.h @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_dma.h,v 1.4 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_dma.h,v 1.5 2003/04/25 01:18:46 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_drv.h b/bsd/drm_drv.h index 689afc9e..b4d53c0c 100644 --- a/bsd/drm_drv.h +++ b/bsd/drm_drv.h @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.12 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.13 2003/04/25 01:18:46 anholt Exp $ */ /* diff --git a/bsd/drm_fops.h b/bsd/drm_fops.h index 1dcc55e0..417c87f3 100644 --- a/bsd/drm_fops.h +++ b/bsd/drm_fops.h @@ -29,7 +29,7 @@ * Daryll Strauss * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.5 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.7 2003/04/25 01:18:46 anholt Exp $ */ #include "drmP.h" @@ -37,7 +37,7 @@ drm_file_t *DRM(find_file_by_proc)(drm_device_t *dev, DRM_STRUCTPROC *p) { #if __FreeBSD_version >= 500021 - uid_t uid = p->td_proc->p_ucred->cr_svuid; + uid_t uid = p->td_ucred->cr_svuid; pid_t pid = p->td_proc->p_pid; #else uid_t uid = p->p_cred->p_svuid; @@ -73,7 +73,7 @@ int DRM(open_helper)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p, priv = (drm_file_t *) DRM(alloc)(sizeof(*priv), DRM_MEM_FILES); bzero(priv, sizeof(*priv)); #if __FreeBSD_version >= 500000 - priv->uid = p->td_proc->p_ucred->cr_svuid; + priv->uid = p->td_ucred->cr_svuid; priv->pid = p->td_proc->p_pid; #else priv->uid = p->p_cred->p_svuid; diff --git a/bsd/drm_ioctl.h b/bsd/drm_ioctl.h index 3e4f8908..4297ff83 100644 --- a/bsd/drm_ioctl.h +++ b/bsd/drm_ioctl.h @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_ioctl.h,v 1.3 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_ioctl.h,v 1.4 2003/04/25 01:18:46 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_lock.h b/bsd/drm_lock.h index 20ad4bff..6d7202d5 100644 --- a/bsd/drm_lock.h +++ b/bsd/drm_lock.h @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_lock.h,v 1.2 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_lock.h,v 1.3 2003/04/25 01:18:46 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_memory.h b/bsd/drm_memory.h index 0df7ee72..1547fa55 100644 --- a/bsd/drm_memory.h +++ b/bsd/drm_memory.h @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_memory.h,v 1.7 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_memory.h,v 1.8 2003/04/25 01:18:46 anholt Exp $ */ #include "drmP.h" diff --git a/bsd/drm_os_freebsd.h b/bsd/drm_os_freebsd.h index 41cd0804..06cf4f4f 100644 --- a/bsd/drm_os_freebsd.h +++ b/bsd/drm_os_freebsd.h @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.8 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.9 2003/04/25 01:18:46 anholt Exp $ */ #include #include diff --git a/bsd/drm_sysctl.h b/bsd/drm_sysctl.h index dd4ef1f9..1cf794c0 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.2 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_sysctl.h,v 1.3 2003/04/25 01:18:46 anholt Exp $ */ #ifdef __FreeBSD__ diff --git a/bsd/drm_vm.h b/bsd/drm_vm.h index 5355b740..66512fb1 100644 --- a/bsd/drm_vm.h +++ b/bsd/drm_vm.h @@ -1,9 +1,9 @@ /* - * $FreeBSD: src/sys/dev/drm/drm_vm.h,v 1.4 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_vm.h,v 1.6 2003/04/25 01:18:46 anholt Exp $ */ #if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -static int DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, vm_offset_t *paddr, +static int DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, vm_paddr_t *paddr, int prot) #elif defined(__FreeBSD__) static int DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, int prot) @@ -32,7 +32,7 @@ static paddr_t DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, int prot) } #if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -int DRM(mmap)(dev_t kdev, vm_offset_t offset, vm_offset_t *paddr, +int DRM(mmap)(dev_t kdev, vm_offset_t offset, vm_paddr_t *paddr, int prot) #elif defined(__FreeBSD__) int DRM(mmap)(dev_t kdev, vm_offset_t offset, int prot) diff --git a/bsd/mga_drv.c b/bsd/mga_drv.c index 324c9129..a6f711da 100644 --- a/bsd/mga_drv.c +++ b/bsd/mga_drv.c @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/mga_drv.c,v 1.4 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/mga_drv.c,v 1.5 2003/04/25 01:18:46 anholt Exp $ */ #include "mga.h" diff --git a/bsd/r128_drv.c b/bsd/r128_drv.c index 031310c3..e7d18959 100644 --- a/bsd/r128_drv.c +++ b/bsd/r128_drv.c @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/r128_drv.c,v 1.4 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/r128_drv.c,v 1.5 2003/04/25 01:18:46 anholt Exp $ */ #include "r128.h" diff --git a/bsd/radeon_drv.c b/bsd/radeon_drv.c index 607dff21..badd7081 100644 --- a/bsd/radeon_drv.c +++ b/bsd/radeon_drv.c @@ -26,7 +26,7 @@ * Authors: * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/radeon_drv.c,v 1.5 2003/03/11 01:38:17 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/radeon_drv.c,v 1.6 2003/04/25 01:18:46 anholt Exp $ */ #include "radeon.h" diff --git a/bsd/tdfx.h b/bsd/tdfx.h index 40aba8fb..820a52da 100644 --- a/bsd/tdfx.h +++ b/bsd/tdfx.h @@ -25,6 +25,8 @@ * * Authors: * Gareth Hughes + * + * $FreeBSD: src/sys/dev/drm/tdfx.h,v 1.1 2002/04/27 20:47:57 anholt Exp $ */ #ifndef __TDFX_H__ diff --git a/bsd/tdfx_drv.c b/bsd/tdfx_drv.c index 967941ac..0229f698 100644 --- a/bsd/tdfx_drv.c +++ b/bsd/tdfx_drv.c @@ -29,7 +29,7 @@ * Daryll Strauss * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/tdfx_drv.c,v 1.3 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/tdfx_drv.c,v 1.4 2003/04/25 01:18:46 anholt Exp $ */ #include "tdfx.h" -- cgit v1.2.3