Restore Eric Anholt's DRM_*MEMORYBARRIER changes from rev 1.11

diff --git a/linux-core/drm_os_linux.h b/linux-core/drm_os_linux.h
index e0ab6a7..e804399 100644 (file)
--- 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 (file)
--- 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