From c14006ba9f0522875327998215150067d8ca6ea7 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Tue, 25 Mar 2003 00:29:14 +0000 Subject: XFree86 4.3.0 merge --- bsd/drm_os_netbsd.h | 129 ++++++++++++++++++++-------------------------------- bsd/mga_drv.c | 8 +--- bsd/r128_drv.c | 9 ++-- bsd/radeon_drv.c | 61 +++++++++++-------------- bsd/tdfx_drv.c | 7 ++- 5 files changed, 85 insertions(+), 129 deletions(-) (limited to 'bsd') diff --git a/bsd/drm_os_netbsd.h b/bsd/drm_os_netbsd.h index 5551f172..605b6a2c 100644 --- a/bsd/drm_os_netbsd.h +++ b/bsd/drm_os_netbsd.h @@ -17,7 +17,6 @@ #include #include #include -#include /* For TIOCSPGRP/TIOCGPGRP */ #include @@ -32,9 +31,11 @@ #include #include +#include "drmvar.h" + #define __REALLY_HAVE_AGP __HAVE_AGP -#define __REALLY_HAVE_MTRR 1 +#define __REALLY_HAVE_MTRR 0 #define __REALLY_HAVE_SG 0 #if __REALLY_HAVE_AGP @@ -42,7 +43,8 @@ #include #endif -#include +#define device_t struct device * +extern struct cfdriver DRM(_cd); #if DRM_DEBUG #undef DRM_DEBUG_CODE @@ -50,20 +52,12 @@ #endif #undef DRM_DEBUG -#if DRM_LINUX -#undef DRM_LINUX /* FIXME: Linux compat has not been ported yet */ -#endif - -typedef drm_device_t *device_t; - -extern struct cfdriver DRM(cd); - #define DRM_TIME_SLICE (hz/20) /* Time slice for GLXContexts */ #define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP) #define DRM_DEV_UID 0 #define DRM_DEV_GID 0 -#define CDEV_MAJOR 34 +#define CDEV_MAJOR 90 #define DRM_CURPROC curproc #define DRM_STRUCTPROC struct proc @@ -79,25 +73,16 @@ extern struct cfdriver DRM(cd); #define DRM_UNLOCK lockmgr(&dev->dev_lock, LK_RELEASE, NULL) #define DRM_SUSER(p) suser(p->p_ucred, &p->p_acflag) #define DRM_TASKQUEUE_ARGS void *dev, int pending -#define DRM_IRQ_ARGS void *arg -#define DRM_DEVICE drm_device_t *dev = device_lookup(&DRM(cd), minor(kdev)) -/* XXX Not sure if this is the 'right' version.. */ -#if __NetBSD_Version__ >= 106140000 -MALLOC_DECLARE(DRM(M_DRM)); -#else -/* XXX Make sure this works */ -extern const int DRM(M_DRM) = M_DEVBUF; -#endif /* __NetBSD_Version__ */ +#define DRM_IRQ_ARGS void *device +#define DRM_DEVICE drm_device_t *dev = device_lookup(&DRM(_cd), minor(kdev)) #define DRM_MALLOC(size) malloc( size, DRM(M_DRM), M_NOWAIT ) -#define DRM_FREE(pt,size) free( pt, DRM(M_DRM) ) +#define DRM_FREE(pt) free( pt, DRM(M_DRM) ) #define DRM_VTOPHYS(addr) vtophys(addr) - -#define DRM_READ8(map, offset) bus_space_read_1( (map)->iot, (map)->ioh, (offset) ) -#define DRM_READ32(map, offset) bus_space_read_4( (map)->iot, (map)->ioh, (offset) ) -#define DRM_WRITE8(map, offset, val) bus_space_write_1( (map)->iot, (map)->ioh, (offset), (val) ) -#define DRM_WRITE32(map, offset, val) bus_space_write_4( (map)->iot, (map)->ioh, (offset), (val) ) - -#define DRM_AGP_FIND_DEVICE() agp_find_device(0) +#define DRM_READ8(addr) *((volatile char *)(addr)) +#define DRM_READ32(addr) *((volatile long *)(addr)) +#define DRM_WRITE8(addr, val) *((volatile char *)(addr)) = (val) +#define DRM_WRITE32(addr, val) *((volatile long *)(addr)) = (val) +#define DRM_AGP_FIND_DEVICE() #define DRM_PRIV \ drm_file_t *priv = (drm_file_t *) DRM(find_file_by_proc)(dev, p); \ @@ -120,7 +105,7 @@ do { \ do { \ drm_map_list_entry_t *listentry; \ TAILQ_FOREACH(listentry, dev->maplist, link) { \ - drm_local_map_t *map = listentry->map; \ + drm_map_t *map = listentry->map; \ if (map->type == _DRM_SHM && \ map->flags & _DRM_CONTAINS_LOCK) { \ dev_priv->sarea = map; \ @@ -129,15 +114,7 @@ do { \ } \ } while (0) -#define DRM_HZ hz - -#define DRM_WAIT_ON( ret, queue, timeout, condition ) \ -while (!condition) { \ - ret = tsleep( (void *)&(queue), PZERO | PCATCH, "drmwtq", (timeout) ); \ - if ( ret ) \ - return ret; \ -} - +#define return DRM_ERR(v) return v; #define DRM_ERR(v) v #define DRM_COPY_TO_USER_IOCTL(arg1, arg2, arg3) \ @@ -148,25 +125,21 @@ while (!condition) { \ copyout(arg2, arg1, arg3) #define DRM_COPY_FROM_USER(arg1, arg2, arg3) \ copyin(arg2, arg1, arg3) -/* Macros for userspace access with checking readability once */ -/* FIXME: can't find equivalent functionality for nocheck yet. - * It'll be slower than linux, but should be correct. - */ -#define DRM_VERIFYAREA_READ( uaddr, size ) \ - (!uvm_useracc((caddr_t)uaddr, size, VM_PROT_READ)) -#define DRM_COPY_FROM_USER_UNCHECKED(arg1, arg2, arg3) \ - copyin(arg2, arg1, arg3) -#define DRM_GET_USER_UNCHECKED(val, uaddr) \ - ((val) = fuword(uaddr), 0) -#define DRM_WRITEMEMORYBARRIER( map ) \ - bus_space_barrier((map)->iot, (map)->ioh, 0, (map)->size, 0); -#define DRM_READMEMORYBARRIER( map ) \ - bus_space_barrier((map)->iot, (map)->ioh, 0, (map)->size, BUS_SPACE_BARRIER_READ); +#define DRM_READMEMORYBARRIER \ +{ \ + int xchangeDummy; \ + DRM_DEBUG("%s\n", __FUNCTION__); \ + __asm__ volatile(" push %%eax ; xchg %%eax, %0 ; pop %%eax" : : "m" (xchangeDummy)); \ + __asm__ volatile(" push %%eax ; push %%ebx ; push %%ecx ; push %%edx ;" \ + " movl $0,%%eax ; cpuid ; pop %%edx ; pop %%ecx ; pop %%ebx ;" \ + " pop %%eax" : /* no outputs */ : /* no inputs */ ); \ +} while (0); -#define DRM_WAKEUP(w) wakeup((void *)w) +#define DRM_WRITEMEMORYBARRIER DRM_READMEMORYBARRIER + +#define DRM_WAKEUP(w) wakeup(w) #define DRM_WAKEUP_INT(w) wakeup(w) -#define DRM_INIT_WAITQUEUE( queue ) do {} while (0) #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) @@ -178,46 +151,30 @@ typedef struct drm_chipinfo char *name; } drm_chipinfo_t; -#define cpu_to_le32(x) (x) /* FIXME */ - typedef u_int32_t dma_addr_t; -typedef volatile long atomic_t; +typedef volatile u_int32_t atomic_t; typedef u_int32_t cycles_t; +typedef u_int32_t spinlock_t; typedef u_int32_t u32; typedef u_int16_t u16; typedef u_int8_t u8; typedef dev_type_ioctl(d_ioctl_t); typedef vaddr_t vm_offset_t; -/* FIXME */ #define atomic_set(p, v) (*(p) = (v)) #define atomic_read(p) (*(p)) -#define atomic_inc(p) (*(p) += 1) -#define atomic_dec(p) (*(p) -= 1) -#define atomic_add(n, p) (*(p) += (n)) -#define atomic_sub(n, p) (*(p) -= (n)) +#define atomic_inc(p) atomic_add_int(p, 1) +#define atomic_dec(p) atomic_subtract_int(p, 1) +#define atomic_add(n, p) atomic_add_int(p, n) +#define atomic_sub(n, p) atomic_subtract_int(p, n) -/* FIXME */ +/* FIXME: Is NetBSD's kernel non-reentrant? */ #define atomic_add_int(p, v) *(p) += v #define atomic_subtract_int(p, v) *(p) -= v #define atomic_set_int(p, bits) *(p) |= (bits) #define atomic_clear_int(p, bits) *(p) &= ~(bits) /* Fake this */ - -static __inline int -atomic_cmpset_int(__volatile__ int *dst, int old, int new) -{ - int s = splhigh(); - if (*dst==old) { - *dst = new; - splx(s); - return 1; - } - splx(s); - return 0; -} - static __inline atomic_t test_and_set_bit(int b, atomic_t *p) { @@ -267,6 +224,20 @@ find_first_zero_bit(atomic_t *p, int max) #define spldrm() spltty() #define jiffies hardclock_ticks +#define __drm_dummy_lock(lock) (*(__volatile__ unsigned int *)lock) +#define _DRM_CAS(lock,old,new,__ret) \ + do { \ + int __dummy; /* Can't mark eax as clobbered */ \ + __asm__ __volatile__( \ + "lock ; cmpxchg %4,%1\n\t" \ + "setnz %0" \ + : "=d" (__ret), \ + "=m" (__drm_dummy_lock(lock)), \ + "=a" (__dummy) \ + : "2" (old), \ + "r" (new)); \ + } while (0) + /* Redefinitions to make templating easy */ #define wait_queue_head_t atomic_t #define agp_memory void @@ -287,7 +258,7 @@ do { \ #define DRM_DEBUG(fmt, arg...) \ do { \ if (DRM(flags) & DRM_FLAG_DEBUG) \ - printf("[" DRM_NAME ":%s] " fmt , __FUNCTION__ ,## arg); \ + printf("[" DRM_NAME ":%s] " fmt , __FUNCTION__,## arg); \ } while (0) #else #define DRM_DEBUG(fmt, arg...) do { } while (0) diff --git a/bsd/mga_drv.c b/bsd/mga_drv.c index de0387f7..8b69b41b 100644 --- a/bsd/mga_drv.c +++ b/bsd/mga_drv.c @@ -27,10 +27,10 @@ * Authors: * Rickard E. (Rik) Faith * Gareth Hughes - * - * $FreeBSD: src/sys/dev/drm/mga_drv.c,v 1.4 2003/03/09 02:08:28 anholt Exp $ */ +#include + #include "mga.h" #include "drmP.h" #include "drm.h" @@ -63,8 +63,4 @@ drm_chipinfo_t DRM(devicelist)[] = { #include "drm_vm.h" #include "drm_sysctl.h" -#ifdef __FreeBSD__ DRIVER_MODULE(mga, pci, mga_driver, mga_devclass, 0, 0); -#elif defined(__NetBSD__) -CFDRIVER_DECL(mga, DV_TTY, NULL); -#endif diff --git a/bsd/r128_drv.c b/bsd/r128_drv.c index 28a2c85e..1a8046fb 100644 --- a/bsd/r128_drv.c +++ b/bsd/r128_drv.c @@ -27,10 +27,11 @@ * Authors: * Rickard E. (Rik) Faith * Gareth Hughes - * - * $FreeBSD: src/sys/dev/drm/r128_drv.c,v 1.4 2003/03/09 02:08:28 anholt Exp $ */ + +#include + #include "r128.h" #include "drmP.h" #include "drm.h" @@ -82,8 +83,4 @@ drm_chipinfo_t DRM(devicelist)[] = { #include "drm_scatter.h" #endif -#ifdef __FreeBSD__ DRIVER_MODULE(r128, pci, r128_driver, r128_devclass, 0, 0); -#elif defined(__NetBSD__) -CFDRIVER_DECL(r128, DV_TTY, NULL); -#endif /* __FreeBSD__ */ diff --git a/bsd/radeon_drv.c b/bsd/radeon_drv.c index 2e7c5d66..a253b9cb 100644 --- a/bsd/radeon_drv.c +++ b/bsd/radeon_drv.c @@ -25,10 +25,10 @@ * * Authors: * Gareth Hughes - * - * $FreeBSD: src/sys/dev/drm/radeon_drv.c,v 1.5 2003/03/11 01:38:17 anholt Exp $ */ +#include + #include "radeon.h" #include "drmP.h" #include "drm.h" @@ -39,41 +39,38 @@ #endif drm_chipinfo_t DRM(devicelist)[] = { - {0x1002, 0x4242, 1, "ATI Radeon BB R200 AIW 8500DV"}, - {0x1002, 0x4336, 1, "ATI Radeon Mobility U1"}, - {0x1002, 0x4964, 1, "ATI Radeon Id R250 9000"}, - {0x1002, 0x4965, 1, "ATI Radeon Ie R250 9000"}, - {0x1002, 0x4966, 1, "ATI Radeon If R250 9000"}, - {0x1002, 0x4967, 1, "ATI Radeon Ig R250 9000"}, - {0x1002, 0x4C57, 1, "ATI Radeon LW Mobility 7500 M7"}, - {0x1002, 0x4C58, 1, "ATI Radeon LX RV200 Mobility FireGL 7800 M7"}, - {0x1002, 0x4C59, 1, "ATI Radeon LY Mobility M6"}, - {0x1002, 0x4C5A, 1, "ATI Radeon LZ Mobility M6"}, - {0x1002, 0x4C64, 1, "ATI Radeon Ld R250 Mobility 9000 M9"}, - {0x1002, 0x4C65, 1, "ATI Radeon Le R250 Mobility 9000 M9"}, - {0x1002, 0x4C66, 1, "ATI Radeon Lf R250 Mobility 9000 M9"}, - {0x1002, 0x4C67, 1, "ATI Radeon Lg R250 Mobility 9000 M9"}, - {0x1002, 0x5144, 1, "ATI Radeon QD R100"}, - {0x1002, 0x5145, 1, "ATI Radeon QE R100"}, - {0x1002, 0x5146, 1, "ATI Radeon QF R100"}, - {0x1002, 0x5147, 1, "ATI Radeon QG R100"}, - {0x1002, 0x5148, 1, "ATI Radeon QH FireGL 8x00"}, + {0x1002, 0x4242, 1, "ATI Radeon BB AIW 8500DV (AGP)"}, + {0x1002, 0x4336, 1, "ATI Radeon Mobility"}, + {0x1002, 0x4964, 1, "ATI Radeon Id 9000"}, + {0x1002, 0x4965, 1, "ATI Radeon Ie 9000"}, + {0x1002, 0x4966, 1, "ATI Radeon If 9000"}, + {0x1002, 0x4967, 1, "ATI Radeon Ig 9000"}, + {0x1002, 0x496e, 1, "ATI Radeon Ig 9000"}, + {0x1002, 0x4C57, 1, "ATI Radeon LW Mobility 7 (AGP)"}, + {0x1002, 0x4C58, 1, "ATI Radeon LX Mobility 7 (AGP)"}, + {0x1002, 0x4C59, 1, "ATI Radeon LY Mobility 6 (AGP)"}, + {0x1002, 0x4C5A, 1, "ATI Radeon LZ Mobility 6 (AGP)"}, + {0x1002, 0x4C64, 1, "ATI Radeon Ld Mobility 9000 (AGP)"}, + {0x1002, 0x4C65, 1, "ATI Radeon Le Mobility 9000 (AGP)"}, + {0x1002, 0x4C66, 1, "ATI Radeon Lf Mobility 9000 (AGP)"}, + {0x1002, 0x4C67, 1, "ATI Radeon Lg Mobility 9000 (AGP)"}, + {0x1002, 0x5144, 1, "ATI Radeon QD R100 (AGP)"}, + {0x1002, 0x5145, 1, "ATI Radeon QE R100 (AGP)"}, + {0x1002, 0x5146, 1, "ATI Radeon QF R100 (AGP)"}, + {0x1002, 0x5147, 1, "ATI Radeon QG R100 (AGP)"}, + {0x1002, 0x5148, 1, "ATI Radeon QH FireGL 8x00 (AGP)"}, {0x1002, 0x5149, 1, "ATI Radeon QI R200"}, {0x1002, 0x514A, 1, "ATI Radeon QJ R200"}, {0x1002, 0x514B, 1, "ATI Radeon QK R200"}, - {0x1002, 0x514C, 1, "ATI Radeon QL R200 8500 LE"}, - {0x1002, 0x514D, 1, "ATI Radeon QM R200 9100"}, - {0x1002, 0x514E, 1, "ATI Radeon QN R200 8500 LE"}, - {0x1002, 0x514F, 1, "ATI Radeon QO R200 8500 LE"}, - {0x1002, 0x5157, 1, "ATI Radeon QW RV200 7500"}, - {0x1002, 0x5158, 1, "ATI Radeon QX RV200 7500"}, - {0x1002, 0x5159, 1, "ATI Radeon QY RV100 VE"}, - {0x1002, 0x515A, 1, "ATI Radeon QZ RV100 VE"}, + {0x1002, 0x514C, 1, "ATI Radeon QL 8500 (AGP)"}, + {0x1002, 0x5157, 1, "ATI Radeon QW 7500 (AGP)"}, + {0x1002, 0x5158, 1, "ATI Radeon QX 7500 (AGP)"}, + {0x1002, 0x5159, 1, "ATI Radeon QY VE (AGP)"}, + {0x1002, 0x515A, 1, "ATI Radeon QZ VE (AGP)"}, {0x1002, 0x5168, 1, "ATI Radeon Qh R200"}, {0x1002, 0x5169, 1, "ATI Radeon Qi R200"}, {0x1002, 0x516A, 1, "ATI Radeon Qj R200"}, {0x1002, 0x516B, 1, "ATI Radeon Qk R200"}, - {0x1002, 0x516C, 1, "ATI Radeon Ql R200"}, {0, 0, 0, NULL} }; @@ -95,8 +92,4 @@ drm_chipinfo_t DRM(devicelist)[] = { #include "drm_scatter.h" #endif -#ifdef __FreeBSD__ DRIVER_MODULE(DRIVER_NAME, pci, DRM(driver), DRM(devclass), 0, 0); -#elif defined(__NetBSD__) -CFDRIVER_DECL(radeon, DV_TTY, NULL); -#endif /* __FreeBSD__ */ diff --git a/bsd/tdfx_drv.c b/bsd/tdfx_drv.c index e10542f1..8bc8c57d 100644 --- a/bsd/tdfx_drv.c +++ b/bsd/tdfx_drv.c @@ -28,10 +28,11 @@ * Rickard E. (Rik) Faith * Daryll Strauss * Gareth Hughes - * - * $FreeBSD: src/sys/dev/drm/tdfx_drv.c,v 1.3 2003/03/09 02:08:28 anholt Exp $ */ + +#include + #include "tdfx.h" #include "drmP.h" @@ -95,6 +96,4 @@ drm_chipinfo_t DRM(devicelist)[] = { #ifdef __FreeBSD__ DRIVER_MODULE(tdfx, pci, tdfx_driver, tdfx_devclass, 0, 0); -#elif defined(__NetBSD__) -CFDRIVER_DECL(tdfx, DV_TTY, NULL); #endif /* __FreeBSD__ */ -- cgit v1.2.3