From 6f07e1ff6bec8f306e8aa1d59b8bcaa93ffa776e Mon Sep 17 00:00:00 2001 From: Rik Faith Date: Sat, 26 Aug 2000 10:36:44 +0000 Subject: Sync with Linux 2.4.0-test7 Add signal blocking support to all drivers (using control-z on a running direct-rendering client should work now) --- linux/drmP.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'linux/drmP.h') diff --git a/linux/drmP.h b/linux/drmP.h index aa9bc01a..b9a4dab4 100644 --- a/linux/drmP.h +++ b/linux/drmP.h @@ -57,7 +57,7 @@ #include #include #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0) +#if LINUX_VERSION_CODE >= 0x020100 /* KERNEL_VERSION(2,1,0) */ #include #include #endif @@ -451,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 */ @@ -535,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; @@ -729,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); -- cgit v1.2.3