diff options
| author | Doug Rabson <dfr@freebsd.org> | 2000-06-13 17:38:09 +0000 |
|---|---|---|
| committer | Doug Rabson <dfr@freebsd.org> | 2000-06-13 17:38:09 +0000 |
| commit | d399dbcd569a66f5bf4863ffa2aab95fa8ebd5fc (patch) | |
| tree | b8593f0ebff44aae83b89416e193d6ffc1ad0f24 /bsd/drmP.h | |
| parent | 2fbd4bf0189cf6d421000c7eea85fee3b9c79ed0 (diff) | |
Merged bsd-1-0-1pre401-20000613-freezebsd-1-0-1-20000613-merge
Diffstat (limited to 'bsd/drmP.h')
| -rw-r--r-- | bsd/drmP.h | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/bsd/drmP.h b/bsd/drmP.h index 863836a66..a60ddae25 100644 --- a/bsd/drmP.h +++ b/bsd/drmP.h @@ -49,7 +49,13 @@ #include <sys/sysctl.h> #include <sys/select.h> #include <sys/bus.h> +#if __FreeBSD_version >= 500005 #include <sys/taskqueue.h> +#endif + +#if __FreeBSD_version >= 500006 +#define DRM_AGP +#endif #ifdef DRM_AGP #include <pci/agpvar.h> @@ -71,9 +77,11 @@ typedef u_int32_t spinlock_t; static __inline u_int32_t test_and_set_bit(int b, volatile u_int32_t *p) { + int s = splhigh(); u_int32_t m = 1<<b; u_int32_t r = *p & m; *p |= m; + splx(s); return r; } @@ -101,9 +109,9 @@ find_first_zero_bit(volatile u_int32_t *p, int max) int b; for (b = 0; b < max; b += 32) { - if (p[b >> 5]) { + if (p[b >> 5] != ~0) { for (;;) { - if (p[b >> 5] & (1 << (b & 0x1f))) + if ((p[b >> 5] & (1 << (b & 0x1f))) == 0) return b; b++; } @@ -117,10 +125,15 @@ find_first_zero_bit(volatile u_int32_t *p, int max) #define memset(p, v, s) bzero(p, s) /* - * Software interrupts for DMA pipe feeding. The FreeBSD kernel apis - * are severely lacking here. + * Fake out the module macros for versions of FreeBSD where they don't + * exist. */ -#define SWI_DRI (SWI_VM+2) +#if __FreeBSD_version < 500002 + +#define MODULE_VERSION(a,b) struct __hack +#define MODULE_DEPEND(a,b,c,d,e) struct __hack + +#endif #define DRM_DEBUG_CODE 2 /* Include debugging code (if > 1, then also include looping detection. */ @@ -504,7 +517,9 @@ typedef struct drm_device { int last_checked; /* Last context checked for DMA */ int last_context; /* Last current context */ int last_switch; /* Time at last context switch */ +#if __FreeBSD_version >= 500005 struct task task; +#endif struct timespec ctx_start; struct timespec lck_start; #if DRM_DMA_HISTOGRAM |