ui: dmabuf: match linux header define names

ui/gfx/linux/client_native_pixmap_dmabuf.cc

Index: ui/gfx/linux/client_native_pixmap_dmabuf.cc
diff --git a/ui/gfx/linux/client_native_pixmap_dmabuf.cc b/ui/gfx/linux/client_native_pixmap_dmabuf.cc
index d656c338f0a6d9eb86e9a3e0a1dd304559d4e28e..a1d7e8d5183fc5b58e0f3445586d960dc1fa48ff 100644
--- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc
+++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc
@@ -20,20 +20,18 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
 #include <linux/types.h>
 
-struct local_dma_buf_sync {
+struct dma_buf_sync {
   __u64 flags;
 };
 
-#define LOCAL_DMA_BUF_SYNC_READ (1 << 0)
-#define LOCAL_DMA_BUF_SYNC_WRITE (2 << 0)
-#define LOCAL_DMA_BUF_SYNC_RW \
-  (LOCAL_DMA_BUF_SYNC_READ | LOCAL_DMA_BUF_SYNC_WRITE)
-#define LOCAL_DMA_BUF_SYNC_START (0 << 2)
-#define LOCAL_DMA_BUF_SYNC_END (1 << 2)
+#define DMA_BUF_SYNC_READ (1 << 0)
+#define DMA_BUF_SYNC_WRITE (2 << 0)
+#define DMA_BUF_SYNC_RW (DMA_BUF_SYNC_READ | DMA_BUF_SYNC_WRITE)
+#define DMA_BUF_SYNC_START (0 << 2)
+#define DMA_BUF_SYNC_END (1 << 2)
 
-#define LOCAL_DMA_BUF_BASE 'b'
-#define LOCAL_DMA_BUF_IOCTL_SYNC \
-  _IOW(LOCAL_DMA_BUF_BASE, 0, struct local_dma_buf_sync)
+#define DMA_BUF_BASE 'b'
+#define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync)
 
 #else
 #include <linux/dma-buf.h>
@@ -44,24 +42,24 @@ namespace gfx {
 namespace {
 
 void PrimeSyncStart(int dmabuf_fd) {
-  struct local_dma_buf_sync sync_start = {0};
+  struct dma_buf_sync sync_start = {0};

[danakj, 2017/04/04 15:46:22]

I'm confused, how did this work before with kernels >= 4.6.0 ? There'd have to
be LOCAL_ versions of everything in dma-buf.h?

 
-  sync_start.flags = LOCAL_DMA_BUF_SYNC_START | LOCAL_DMA_BUF_SYNC_RW;
+  sync_start.flags = DMA_BUF_SYNC_START | DMA_BUF_SYNC_RW;
 #if DCHECK_IS_ON()
   int rv =
 #endif
-      drmIoctl(dmabuf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_start);
+      drmIoctl(dmabuf_fd, DMA_BUF_IOCTL_SYNC, &sync_start);
   DPLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_START";
 }
 
 void PrimeSyncEnd(int dmabuf_fd) {
-  struct local_dma_buf_sync sync_end = {0};
+  struct dma_buf_sync sync_end = {0};
 
-  sync_end.flags = LOCAL_DMA_BUF_SYNC_END | LOCAL_DMA_BUF_SYNC_RW;
+  sync_end.flags = DMA_BUF_SYNC_END | DMA_BUF_SYNC_RW;
 #if DCHECK_IS_ON()
   int rv =
 #endif
-      drmIoctl(dmabuf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_end);
+      drmIoctl(dmabuf_fd, DMA_BUF_IOCTL_SYNC, &sync_end);
   DPLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_END";
 }