fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-27 02:20:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

small cleanups from Eric.

Browse source
This commit is contained in:
Alan Hourihane 2001-09-11 16:55:40 +00:00
parent 6aafd3ed73
commit 80fc5b66b7
17 changed files with 59 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
bsd-core/drm_agpsupport.c
View file

@ -39,8 +39,7 @@
#endif
#endif
int DRM(agp_info)(dev_t kdev, u_long cmd, caddr_t data,
int flags, struct proc *p)
int DRM(agp_info)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;
struct agp_info *kern;
@ -64,8 +63,7 @@ int DRM(agp_info)(dev_t kdev, u_long cmd, caddr_t data,
return 0;
}
int DRM(agp_acquire)(dev_t kdev, u_long cmd, caddr_t data,
int flags, struct proc *p)
int DRM(agp_acquire)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;
int retcode;
@ -77,8 +75,7 @@ int DRM(agp_acquire)(dev_t kdev, u_long cmd, caddr_t data,
return 0;
}
int DRM(agp_release)(dev_t kdev, u_long cmd, caddr_t data,
int flags, struct proc *p)
int DRM(agp_release)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;
@ -99,8 +96,7 @@ void DRM(agp_do_release)(void)
agp_release(agpdev);
}
int DRM(agp_enable)(dev_t kdev, u_long cmd, caddr_t data,
int flags, struct proc *p)
int DRM(agp_enable)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;
drm_agp_mode_t mode;
@ -116,8 +112,7 @@ int DRM(agp_enable)(dev_t kdev, u_long cmd, caddr_t data,
return 0;
}
int DRM(agp_alloc)(dev_t kdev, u_long cmd, caddr_t data,
int flags, struct proc *p)
int DRM(agp_alloc)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;
drm_agp_buffer_t request;
@ -172,8 +167,7 @@ static drm_agp_mem_t * DRM(agp_lookup_entry)(drm_device_t *dev, void *handle)
return NULL;
}
int DRM(agp_unbind)(dev_t kdev, u_long cmd, caddr_t data,
int flags, struct proc *p)
int DRM(agp_unbind)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;
drm_agp_binding_t request;
@ -195,8 +189,7 @@ int DRM(agp_unbind)(dev_t kdev, u_long cmd, caddr_t data,
return retcode;
}
int DRM(agp_bind)(dev_t kdev, u_long cmd, caddr_t data,
int flags, struct proc *p)
int DRM(agp_bind)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;
drm_agp_binding_t request;
@ -218,8 +211,7 @@ int DRM(agp_bind)(dev_t kdev, u_long cmd, caddr_t data,
return 0;
}
int DRM(agp_free)(dev_t kdev, u_long cmd, caddr_t data,
int flags, struct proc *p)
int DRM(agp_free)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;
drm_agp_buffer_t request;

4
bsd-core/drm_os_freebsd.h
View file

@ -48,12 +48,12 @@
#define DRM_OS_UNLOCK lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc)
#if __FreeBSD_version >= 500000
#define DRM_OS_SPINTYPE struct mtx
#define DRM_OS_SPININIT(l,name) mtx_init(l, name, MTX_DEF)
#define DRM_OS_SPININIT(l,name) mtx_init(&l, name, MTX_DEF)
#define DRM_OS_SPINLOCK(l) mtx_lock(l)
#define DRM_OS_SPINUNLOCK(u) mtx_unlock(u);
#else
#define DRM_OS_SPINTYPE struct simplelock
#define DRM_OS_SPININIT(l,name) simple_lock_init(l)
#define DRM_OS_SPININIT(l,name) simple_lock_init(&l)
#define DRM_OS_SPINLOCK(l) simple_lock(l)
#define DRM_OS_SPINUNLOCK(u) simple_unlock(u);
#endif

24
bsd-core/drm_sysctl.c
View file

@ -166,9 +166,9 @@ static int DRM(vm_info)DRM_SYSCTL_HANDLER_ARGS
drm_device_t *dev = arg1;
int ret;
lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
DRM_OS_LOCK;
ret = DRM(_vm_info)(oidp, arg1, arg2, req);
lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
DRM_OS_UNLOCK;
return ret;
}
@ -217,9 +217,9 @@ static int DRM(queues_info) DRM_SYSCTL_HANDLER_ARGS
drm_device_t *dev = arg1;
int ret;
lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
DRM_OS_LOCK;
ret = DRM(_queues_info)(oidp, arg1, arg2, req);
lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
DRM_OS_UNLOCK;
return ret;
}
@ -267,9 +267,9 @@ static int DRM(bufs_info) DRM_SYSCTL_HANDLER_ARGS
drm_device_t *dev = arg1;
int ret;
lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
DRM_OS_LOCK;
ret = DRM(_bufs_info)(oidp, arg1, arg2, req);
lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
DRM_OS_UNLOCK;
return ret;
}
@ -301,9 +301,9 @@ static int DRM(clients_info)DRM_SYSCTL_HANDLER_ARGS
drm_device_t *dev = arg1;
int ret;
lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
DRM_OS_LOCK;
ret = DRM(_clients_info)(oidp, arg1, arg2, req);
lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
DRM_OS_UNLOCK;
return ret;
}
@ -386,9 +386,9 @@ static int DRM(vma_info)DRM_SYSCTL_HANDLER_ARGS
drm_device_t *dev = arg1;
int ret;
lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
DRM_OS_LOCK;
ret = DRM(_vma_info)(oidp, arg1, arg2, req);
lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
DRM_OS_UNLOCK;
return ret;
}
#endif
@ -515,9 +515,9 @@ static int DRM(histo_info)DRM_SYSCTL_HANDLER_ARGS
drm_device_t *dev = arg1;
int ret;
lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
DRM_OS_LOCK;
ret = _drm_histo_info(oidp, arg1, arg2, req);
lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
DRM_OS_UNLOCK;
return ret;
}
#endif

2
bsd/Imakefile
View file

@ -9,7 +9,7 @@ XCOMM dependencies are stuck in drmP.h
includes:: tdfxinc mgainc gammainc r128inc radeoninc sisinc i810inc
clean::
rm -f tdfx/tdfx* mga/mga* gamma/gamma* r128/r128* radeon/radeon* sis/sis* i810/i810*
$(RM) tdfx/tdfx* mga/mga* gamma/gamma* r128/r128* radeon/radeon* sis/sis* i810/i810*
LINUXDRM = ../$(XF86OSSRC)/linux/drm/kernel

24
bsd/drm_agpsupport.h
View file

@ -39,8 +39,7 @@
#endif
#endif
int DRM(agp_info)(dev_t kdev, u_long cmd, caddr_t data,
int flags, struct proc *p)
int DRM(agp_info)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;
struct agp_info *kern;
@ -64,8 +63,7 @@ int DRM(agp_info)(dev_t kdev, u_long cmd, caddr_t data,
return 0;
}
int DRM(agp_acquire)(dev_t kdev, u_long cmd, caddr_t data,
int flags, struct proc *p)
int DRM(agp_acquire)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;
int retcode;
@ -77,8 +75,7 @@ int DRM(agp_acquire)(dev_t kdev, u_long cmd, caddr_t data,
return 0;
}
int DRM(agp_release)(dev_t kdev, u_long cmd, caddr_t data,
int flags, struct proc *p)
int DRM(agp_release)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;
@ -99,8 +96,7 @@ void DRM(agp_do_release)(void)
agp_release(agpdev);
}
int DRM(agp_enable)(dev_t kdev, u_long cmd, caddr_t data,
int flags, struct proc *p)
int DRM(agp_enable)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;
drm_agp_mode_t mode;
@ -116,8 +112,7 @@ int DRM(agp_enable)(dev_t kdev, u_long cmd, caddr_t data,
return 0;
}
int DRM(agp_alloc)(dev_t kdev, u_long cmd, caddr_t data,
int flags, struct proc *p)
int DRM(agp_alloc)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;
drm_agp_buffer_t request;
@ -172,8 +167,7 @@ static drm_agp_mem_t * DRM(agp_lookup_entry)(drm_device_t *dev, void *handle)
return NULL;
}
int DRM(agp_unbind)(dev_t kdev, u_long cmd, caddr_t data,
int flags, struct proc *p)
int DRM(agp_unbind)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;
drm_agp_binding_t request;
@ -195,8 +189,7 @@ int DRM(agp_unbind)(dev_t kdev, u_long cmd, caddr_t data,
return retcode;
}
int DRM(agp_bind)(dev_t kdev, u_long cmd, caddr_t data,
int flags, struct proc *p)
int DRM(agp_bind)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;
drm_agp_binding_t request;
@ -218,8 +211,7 @@ int DRM(agp_bind)(dev_t kdev, u_long cmd, caddr_t data,
return 0;
}
int DRM(agp_free)(dev_t kdev, u_long cmd, caddr_t data,
int flags, struct proc *p)
int DRM(agp_free)(DRM_OS_IOCTL)
{
drm_device_t *dev = kdev->si_drv1;
drm_agp_buffer_t request;

4
bsd/drm_os_freebsd.h
View file

@ -48,12 +48,12 @@
#define DRM_OS_UNLOCK lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc)
#if __FreeBSD_version >= 500000
#define DRM_OS_SPINTYPE struct mtx
#define DRM_OS_SPININIT(l,name) mtx_init(l, name, MTX_DEF)
#define DRM_OS_SPININIT(l,name) mtx_init(&l, name, MTX_DEF)
#define DRM_OS_SPINLOCK(l) mtx_lock(l)
#define DRM_OS_SPINUNLOCK(u) mtx_unlock(u);
#else
#define DRM_OS_SPINTYPE struct simplelock
#define DRM_OS_SPININIT(l,name) simple_lock_init(l)
#define DRM_OS_SPININIT(l,name) simple_lock_init(&l)
#define DRM_OS_SPINLOCK(l) simple_lock(l)
#define DRM_OS_SPINUNLOCK(u) simple_unlock(u);
#endif

24
bsd/drm_sysctl.h
View file

@ -166,9 +166,9 @@ static int DRM(vm_info)DRM_SYSCTL_HANDLER_ARGS
drm_device_t *dev = arg1;
int ret;
lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
DRM_OS_LOCK;
ret = DRM(_vm_info)(oidp, arg1, arg2, req);
lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
DRM_OS_UNLOCK;
return ret;
}
@ -217,9 +217,9 @@ static int DRM(queues_info) DRM_SYSCTL_HANDLER_ARGS
drm_device_t *dev = arg1;
int ret;
lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
DRM_OS_LOCK;
ret = DRM(_queues_info)(oidp, arg1, arg2, req);
lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
DRM_OS_UNLOCK;
return ret;
}
@ -267,9 +267,9 @@ static int DRM(bufs_info) DRM_SYSCTL_HANDLER_ARGS
drm_device_t *dev = arg1;
int ret;
lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
DRM_OS_LOCK;
ret = DRM(_bufs_info)(oidp, arg1, arg2, req);
lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
DRM_OS_UNLOCK;
return ret;
}
@ -301,9 +301,9 @@ static int DRM(clients_info)DRM_SYSCTL_HANDLER_ARGS
drm_device_t *dev = arg1;
int ret;
lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
DRM_OS_LOCK;
ret = DRM(_clients_info)(oidp, arg1, arg2, req);
lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
DRM_OS_UNLOCK;
return ret;
}
@ -386,9 +386,9 @@ static int DRM(vma_info)DRM_SYSCTL_HANDLER_ARGS
drm_device_t *dev = arg1;
int ret;
lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
DRM_OS_LOCK;
ret = DRM(_vma_info)(oidp, arg1, arg2, req);
lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
DRM_OS_UNLOCK;
return ret;
}
#endif
@ -515,9 +515,9 @@ static int DRM(histo_info)DRM_SYSCTL_HANDLER_ARGS
drm_device_t *dev = arg1;
int ret;
lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
DRM_OS_LOCK;
ret = _drm_histo_info(oidp, arg1, arg2, req);
lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
DRM_OS_UNLOCK;
return ret;
}
#endif

6
linux-core/drmP.h
View file

@ -249,8 +249,8 @@ typedef struct drm_waitlist {
drm_buf_t **rp; /* Read pointer */
drm_buf_t **wp; /* Write pointer */
drm_buf_t **end; /* End pointer */
spinlock_t read_lock;
spinlock_t write_lock;
DRM_OS_SPINTYPE read_lock;
DRM_OS_SPINTYPE write_lock;
} drm_waitlist_t;
typedef struct drm_freelist {
@ -262,7 +262,7 @@ typedef struct drm_freelist {
int low_mark; /* Low water mark */
int high_mark; /* High water mark */
atomic_t wfh; /* If waiting for high mark */
spinlock_t lock;
DRM_OS_SPINTYPE lock;
} drm_freelist_t;
typedef struct drm_buf_entry {

2
linux-core/drm_auth.c
View file

@ -131,7 +131,7 @@ int DRM(getmagic)(DRM_OS_IOCTL)
#ifdef __FreeBSD__
if (first) {
DRM_OS_SPININIT(&lock, "drm getmagic");
DRM_OS_SPININIT(lock, "drm getmagic");
first = 0;
}
#endif /* __FreeBSD__ */

2
linux-core/drm_ioctl.c
View file

@ -276,7 +276,7 @@ int DRM(getclient)( DRM_OS_IOCTL )
client.uid = pt->uid;
client.magic = pt->magic;
client.iocs = pt->ioctl_count;
lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
DRM_OS_UNLOCK;
*(drm_client_t *)data = client;
return 0;

2
linux-core/drm_memory.h
View file

@ -102,7 +102,7 @@ void DRM(mem_init)(void)
#endif /* __linux__ */
#ifdef __FreeBSD__
DRM_OS_SPININIT(&DRM(mem_lock), "drm memory");
DRM_OS_SPININIT(DRM(mem_lock), "drm memory");
#endif /* __FreeBSD__ */
for (mem = DRM(mem_stats); mem->name; ++mem) {

1
linux-core/drm_os_linux.h
View file

@ -257,6 +257,7 @@ do { \
#define DRM_OS_LOCK up(&dev->struct_sem)
#define DRM_OS_UNLOCK down(&dev->struct_sem)
#define DRM_OS_SPINTYPE spinlock_t
#define DRM_OS_SPININIT(l,name)
#define DRM_OS_SPINLOCK(l) spin_lock(l)
#define DRM_OS_SPINUNLOCK(u) spin_unlock(u)

6
linux/drmP.h
View file

@ -249,8 +249,8 @@ typedef struct drm_waitlist {
drm_buf_t **rp; /* Read pointer */
drm_buf_t **wp; /* Write pointer */
drm_buf_t **end; /* End pointer */
spinlock_t read_lock;
spinlock_t write_lock;
DRM_OS_SPINTYPE read_lock;
DRM_OS_SPINTYPE write_lock;
} drm_waitlist_t;
typedef struct drm_freelist {
@ -262,7 +262,7 @@ typedef struct drm_freelist {
int low_mark; /* Low water mark */
int high_mark; /* High water mark */
atomic_t wfh; /* If waiting for high mark */
spinlock_t lock;
DRM_OS_SPINTYPE lock;
} drm_freelist_t;
typedef struct drm_buf_entry {

2
linux/drm_auth.h
View file

@ -131,7 +131,7 @@ int DRM(getmagic)(DRM_OS_IOCTL)
#ifdef __FreeBSD__
if (first) {
DRM_OS_SPININIT(&lock, "drm getmagic");
DRM_OS_SPININIT(lock, "drm getmagic");
first = 0;
}
#endif /* __FreeBSD__ */

2
linux/drm_ioctl.h
View file

@ -276,7 +276,7 @@ int DRM(getclient)( DRM_OS_IOCTL )
client.uid = pt->uid;
client.magic = pt->magic;
client.iocs = pt->ioctl_count;
lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
DRM_OS_UNLOCK;
*(drm_client_t *)data = client;
return 0;

2
linux/drm_memory.h
View file

@ -102,7 +102,7 @@ void DRM(mem_init)(void)
#endif /* __linux__ */
#ifdef __FreeBSD__
DRM_OS_SPININIT(&DRM(mem_lock), "drm memory");
DRM_OS_SPININIT(DRM(mem_lock), "drm memory");
#endif /* __FreeBSD__ */
for (mem = DRM(mem_stats); mem->name; ++mem) {

1
linux/drm_os_linux.h
View file

@ -257,6 +257,7 @@ do { \
#define DRM_OS_LOCK up(&dev->struct_sem)
#define DRM_OS_UNLOCK down(&dev->struct_sem)
#define DRM_OS_SPINTYPE spinlock_t
#define DRM_OS_SPININIT(l,name)
#define DRM_OS_SPINLOCK(l) spin_lock(l)
#define DRM_OS_SPINUNLOCK(u) spin_unlock(u)