diff options
| author | Eric Anholt <anholt@freebsd.org> | 2003-04-24 05:56:44 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2003-04-24 05:56:44 +0000 |
| commit | c6d2af70cb30a5cc65aebae2637313158a95346e (patch) | |
| tree | 0461cc385059e5880da13a51910a39b24037f796 /bsd-core/drmP.h | |
| parent | af3bfdef26b2d02ea4877e3d57601e57ffa4e95a (diff) | |
Move some common code from addbufs_<type> to addbufs. Make buf_alloc be
protected by the count_lock and make it non-atomic.
Diffstat (limited to 'bsd-core/drmP.h')
| -rw-r--r-- | bsd-core/drmP.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h index 236dab6d..0957c0f1 100644 --- a/bsd-core/drmP.h +++ b/bsd-core/drmP.h @@ -348,12 +348,12 @@ struct drm_device { int flags; /* Flags to open(2) */ /* Locks */ - DRM_SPINTYPE count_lock; /* For inuse, open_count, buf_use */ + DRM_SPINTYPE count_lock; /* For open_count, buf_use, buf_alloc */ struct lock dev_lock; /* For others */ /* Usage Counters */ int open_count; /* Outstanding files open */ int buf_use; /* Buffers in use -- cannot alloc */ - atomic_t buf_alloc; /* Buffer allocation in progress */ + int buf_alloc; /* Buffer allocation in progress */ /* Performance counters */ unsigned long counters; @@ -597,9 +597,6 @@ extern int DRM(finish)(DRM_IOCTL_ARGS); extern int DRM(addmap)(DRM_IOCTL_ARGS); extern int DRM(rmmap)(DRM_IOCTL_ARGS); #if __HAVE_DMA -extern int DRM(addbufs_agp)(DRM_IOCTL_ARGS); -extern int DRM(addbufs_pci)(DRM_IOCTL_ARGS); -extern int DRM(addbufs_sg)(DRM_IOCTL_ARGS); extern int DRM(addbufs)(DRM_IOCTL_ARGS); extern int DRM(infobufs)(DRM_IOCTL_ARGS); extern int DRM(markbufs)(DRM_IOCTL_ARGS); |