diff options
| author | Gareth Hughes <gareth@users.sourceforge.net> | 2000-08-27 16:55:07 +0000 |
|---|---|---|
| committer | Gareth Hughes <gareth@users.sourceforge.net> | 2000-08-27 16:55:07 +0000 |
| commit | a5c98c730f6a865f0fb457103bfeb6dad5b82045 (patch) | |
| tree | 4fa4a25c43b5d58186af35f57f9601e671296963 /linux-core/drmP.h | |
| parent | ae24dece16ecc9f491f9591379ff7897c9b507a4 (diff) | |
Get latest kernel module updates from Rik Faith. Thanks, Rik! Sync with
2.4.0-test7, other fixes currently on the trunk.
Diffstat (limited to 'linux-core/drmP.h')
| -rw-r--r-- | linux-core/drmP.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 0fa205717..b9a4dab42 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -57,7 +57,7 @@ #include <linux/types.h> #include <linux/agp_backend.h> #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0) +#if LINUX_VERSION_CODE >= 0x020100 /* KERNEL_VERSION(2,1,0) */ #include <linux/tqueue.h> #include <linux/poll.h> #endif @@ -328,6 +328,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_freelist_t; typedef struct drm_buf_entry { @@ -450,6 +451,11 @@ typedef struct { extern drm_agp_func_t drm_agp; #endif +typedef struct drm_sigdata { + int context; + drm_hw_lock_t *lock; +} drm_sigdata_t; + typedef struct drm_device { const char *name; /* Simple driver name */ char *unique; /* Unique identifier: e.g., busid */ @@ -534,6 +540,8 @@ typedef struct drm_device { #endif unsigned long *ctx_bitmap; void *dev_private; + drm_sigdata_t sigdata; /* For block_all_signals */ + sigset_t sigmask; } drm_device_t; @@ -728,6 +736,7 @@ extern int drm_flush_unblock(drm_device_t *dev, int context, drm_lock_flags_t flags); extern int drm_flush_block_and_flush(drm_device_t *dev, int context, drm_lock_flags_t flags); +extern int drm_notifier(void *priv); /* Context Bitmap support (ctxbitmap.c) */ extern int drm_ctxbitmap_init(drm_device_t *dev); |