diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2002-09-23 17:26:43 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2002-09-23 17:26:43 +0000 |
| commit | f1c8fe95578e15d5eece6ad52540ce2c7c671f70 (patch) | |
| tree | dfd6a35378df1848c9d2aa40129e6c869b00980d /bsd | |
| parent | cfa1a918b6d6b2d0fd9ae0f58f5b86a15c443dcb (diff) | |
merged r200-0-2-branch to trunk
Diffstat (limited to 'bsd')
| -rw-r--r-- | bsd/Imakefile | 2 | ||||
| -rw-r--r-- | bsd/drm_drv.h | 2 | ||||
| -rw-r--r-- | bsd/drm_os_freebsd.h | 4 | ||||
| -rw-r--r-- | bsd/gamma_dma.c | 4 | ||||
| -rw-r--r-- | bsd/radeon/Makefile | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/bsd/Imakefile b/bsd/Imakefile index 4923ea5b..575e72b4 100644 --- a/bsd/Imakefile +++ b/bsd/Imakefile @@ -36,4 +36,6 @@ LinkSourceFile(radeon.h,$(XF86OSSRC)/shared/drm/kernel) LinkSourceFile(radeon_cp.c,$(XF86OSSRC)/shared/drm/kernel) LinkSourceFile(radeon_drm.h,$(XF86OSSRC)/shared/drm/kernel) LinkSourceFile(radeon_drv.h,$(XF86OSSRC)/shared/drm/kernel) +LinkSourceFile(radeon_irq.c,$(XF86OSSRC)/shared/drm/kernel) +LinkSourceFile(radeon_mem.c,$(XF86OSSRC)/shared/drm/kernel) LinkSourceFile(radeon_state.c,$(XF86OSSRC)/shared/drm/kernel) diff --git a/bsd/drm_drv.h b/bsd/drm_drv.h index 81ca644a..0b880047 100644 --- a/bsd/drm_drv.h +++ b/bsd/drm_drv.h @@ -962,11 +962,11 @@ int DRM(close)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p) priv->refs--; if (!priv->refs) { TAILQ_REMOVE(&dev->files, priv, link); + DRM(free)( priv, sizeof(*priv), DRM_MEM_FILES ); } } DRM_UNLOCK; - DRM(free)( priv, sizeof(*priv), DRM_MEM_FILES ); /* ======================================================== * End inline drm_release diff --git a/bsd/drm_os_freebsd.h b/bsd/drm_os_freebsd.h index 6f878d4f..fa0c916f 100644 --- a/bsd/drm_os_freebsd.h +++ b/bsd/drm_os_freebsd.h @@ -96,8 +96,8 @@ #define DRM_LOCK lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, DRM_CURPROC) #define DRM_UNLOCK lockmgr(&dev->dev_lock, LK_RELEASE, 0, DRM_CURPROC) #define DRM_SUSER(p) suser(p) -#define DRM_TASKQUEUE_ARGS void *dev, int pending -#define DRM_IRQ_ARGS void *device +#define DRM_TASKQUEUE_ARGS void *arg, int pending +#define DRM_IRQ_ARGS void *arg #define DRM_DEVICE drm_device_t *dev = kdev->si_drv1 #define DRM_MALLOC(size) malloc( size, DRM(M_DRM), M_NOWAIT ) #define DRM_FREE(pt) free( pt, DRM(M_DRM) ) diff --git a/bsd/gamma_dma.c b/bsd/gamma_dma.c index e7ca0695..20b29793 100644 --- a/bsd/gamma_dma.c +++ b/bsd/gamma_dma.c @@ -116,7 +116,7 @@ static __inline__ int gamma_dma_is_ready(drm_device_t *dev) void gamma_dma_service( DRM_IRQ_ARGS) { - drm_device_t *dev = (drm_device_t *)device; + drm_device_t *dev = (drm_device_t *)arg; drm_device_dma_t *dma = dev->dma; drm_gamma_private_t *dev_priv = (drm_gamma_private_t *)dev->dev_private; @@ -262,7 +262,7 @@ static void gamma_dma_timer_bh(unsigned long dev) void gamma_dma_immediate_bh(DRM_TASKQUEUE_ARGS) { - gamma_dma_schedule(dev, 0); + gamma_dma_schedule(arg, 0); } int gamma_dma_schedule(drm_device_t *dev, int locked) diff --git a/bsd/radeon/Makefile b/bsd/radeon/Makefile index 613cc033..691e9138 100644 --- a/bsd/radeon/Makefile +++ b/bsd/radeon/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/.. KMOD = radeon NOMAN= YES -SRCS = radeon_cp.c radeon_drv.c radeon_state.c +SRCS = radeon_cp.c radeon_drv.c radeon_state.c radeon_irq.c radeon_mem.c SRCS += device_if.h bus_if.h pci_if.h opt_drm.h CFLAGS += ${DEBUG_FLAGS} -I. -I.. |