drm: Kill DRM_*MEMORYBARRIER

The real linux interfaces are soooo much easier on the eyes ...

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c
index 6e673fa968e5..d2b2df9e26f3 100644
--- a/drivers/gpu/drm/savage/savage_bci.c
+++ b/drivers/gpu/drm/savage/savage_bci.c
@@ -49,7 +49,7 @@ savage_bci_wait_fifo_shadow(drm_savage_private_t * dev_priv, unsigned int n)
 #endif
 
         for (i = 0; i < SAVAGE_DEFAULT_USEC_TIMEOUT; i++) {
-                DRM_MEMORYBARRIER();
+                mb();
                 status = dev_priv->status_ptr[0];
                 if ((status & mask) < threshold)
                         return 0;
@@ -123,7 +123,7 @@ savage_bci_wait_event_shadow(drm_savage_private_t * dev_priv, uint16_t e)
         int i;
 
         for (i = 0; i < SAVAGE_EVENT_USEC_TIMEOUT; i++) {
-                DRM_MEMORYBARRIER();
+                mb();
                 status = dev_priv->status_ptr[1];
                 if ((((status & 0xffff) - e) & 0xffff) <= 0x7fff ||
                     (status & 0xffff) == 0)
@@ -449,7 +449,7 @@ static void savage_dma_flush(drm_savage_private_t * dev_priv)
                 }
         }
 
-        DRM_MEMORYBARRIER();
+        mb();
 
         /* do flush ... */
         phys_addr = dev_priv->cmd_dma->offset +
diff --git a/drivers/gpu/drm/savage/savage_state.c b/drivers/gpu/drm/savage/savage_state.c
index 2d3e56d94be3..c01ad0aeaa58 100644
--- a/drivers/gpu/drm/savage/savage_state.c
+++ b/drivers/gpu/drm/savage/savage_state.c
@@ -1032,7 +1032,7 @@ int savage_bci_cmdbuf(struct drm_device *dev, void *data, struct drm_file *file_
 
         /* Make sure writes to DMA buffers are finished before sending
          * DMA commands to the graphics hardware. */
-        DRM_MEMORYBARRIER();
+        mb();
 
         /* Coming from user space. Don't know if the Xserver has
          * emitted wait commands. Assuming the worst. */