diff options
| author | Eric Anholt <anholt@freebsd.org> | 2003-02-21 23:23:09 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2003-02-21 23:23:09 +0000 |
| commit | cfa778af9c70faea8c13e5cb7f80029eee0d074e (patch) | |
| tree | 15483e64b6c2b56d3bb0f247df9df2c2602e0404 /linux-core | |
| parent | a64472d18493de575a7636704b45babe7b4b4572 (diff) | |
Merge from bsd-4-0-0-branch.
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/drmP.h | 3 | ||||
| -rw-r--r-- | linux-core/drm_os_linux.h | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 01045037..c20166e2 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -255,6 +255,7 @@ do { \ } \ } \ } while(0) +#define DRM_DROP_MAP(_map) /* Internal types and structures */ #define DRM_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) @@ -517,6 +518,8 @@ typedef struct drm_map_list { drm_map_t *map; } drm_map_list_t; +typedef drm_map_t drm_local_map_t; + #if __HAVE_VBL_IRQ typedef struct drm_vbl_sig { diff --git a/linux-core/drm_os_linux.h b/linux-core/drm_os_linux.h index e9b24356..332c3fd9 100644 --- a/linux-core/drm_os_linux.h +++ b/linux-core/drm_os_linux.h @@ -7,12 +7,12 @@ #define DRM_ERR(d) -(d) #define DRM_CURRENTPID current->pid #define DRM_UDELAY(d) udelay(d) -#define DRM_READ8(addr) readb(addr) -#define DRM_READ32(addr) readl(addr) -#define DRM_WRITE8(addr, val) writeb(val, addr) -#define DRM_WRITE32(addr, val) writel(val, addr) -#define DRM_READMEMORYBARRIER() mb() -#define DRM_WRITEMEMORYBARRIER() wmb() +#define DRM_READ8(map, offset) readb(((unsigned long)(map)->handle) + (offset)) +#define DRM_READ32(map, offset) readl(((unsigned long)(map)->handle) + (offset)) +#define DRM_WRITE8(map, offset, val) writeb(val, ((unsigned long)(map)->handle) + (offset)) +#define DRM_WRITE32(map, offset, val) writel(val, ((unsigned long)(map)->handle) + (offset)) +#define DRM_READMEMORYBARRIER(map) mb() +#define DRM_WRITEMEMORYBARRIER(map) wmb() #define DRM_DEVICE drm_file_t *priv = filp->private_data; \ drm_device_t *dev = priv->dev |