From 5f1e2399eb5b76537c91fc9aba2569f2c289a284 Mon Sep 17 00:00:00 2001 From: Leif Delgass Date: Mon, 28 Apr 2003 17:49:26 +0000 Subject: [PATCH] Restore Eric Anholt's DRM_*MEMORYBARRIER changes from rev 1.11 --- linux-core/drm_os_linux.h | 5 +++-- linux/drm_os_linux.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/linux-core/drm_os_linux.h b/linux-core/drm_os_linux.h index e0ab6a7..e804399 100644 --- a/linux-core/drm_os_linux.h +++ b/linux-core/drm_os_linux.h @@ -12,8 +12,9 @@ #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(v) rmb() -#define DRM_WRITEMEMORYBARRIER(v) wmb() +#define DRM_READMEMORYBARRIER() rmb() +#define DRM_WRITEMEMORYBARRIER() wmb() +#define DRM_MEMORYBARRIER() mb() #define DRM_DEVICE drm_file_t *priv = filp->private_data; \ drm_device_t *dev = priv->dev diff --git a/linux/drm_os_linux.h b/linux/drm_os_linux.h index e0ab6a7..e804399 100644 --- a/linux/drm_os_linux.h +++ b/linux/drm_os_linux.h @@ -12,8 +12,9 @@ #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(v) rmb() -#define DRM_WRITEMEMORYBARRIER(v) wmb() +#define DRM_READMEMORYBARRIER() rmb() +#define DRM_WRITEMEMORYBARRIER() wmb() +#define DRM_MEMORYBARRIER() mb() #define DRM_DEVICE drm_file_t *priv = filp->private_data; \ drm_device_t *dev = priv->dev -- 2.7.4