ui/ozone: Flush CPU caches when mapping/unmapping prime pixmap

ui/ozone/platform/drm/common/client_native_pixmap_dmabuf.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/ozone/platform/drm/common/client_native_pixmap_dmabuf.h"
 
 #include <fcntl.h>
+#if defined(OS_CHROMEOS)
+/*
+ * TODO(vignatti): replace the local definitions below with #include
+ * <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ */
+#include <linux/types.h>
+
+struct local_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_START     (0 << 2)
+#define LOCAL_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)
+#endif

[spang, 2016/03/30 21:03:25]

Use a C++ style comment and move it below the #includes

[vignatti (out of this project), 2016/03/30 21:13:56]

Done.

 #include <stddef.h>
 #include <sys/mman.h>
 #include <xf86drm.h>
 
 #include "base/process/memory.h"
 #include "base/trace_event/trace_event.h"
 
 namespace ui {
 
+namespace {
+
+void PrimeSyncStart(int dmabuf_fd) {
+  struct local_dma_buf_sync sync_start = {0};
+
+  sync_start.flags = LOCAL_DMA_BUF_SYNC_START | LOCAL_DMA_BUF_SYNC_READ;
+  if (drmIoctl(dmabuf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_start))
+    PLOG(ERROR) << "fail to sync start dma buf fd";

[spang, 2016/03/30 21:03:25]

"Failed to" or better yet "Failed DMA_BUF_IOCTL_SYNC"

[vignatti (out of this project), 2016/03/30 21:13:56]

Done. But I've used "Failed DMA_BUF_SYNC_START" and "Failed DMA_BUF_SYNC_END"
respectively.

+}
+
+void PrimeSyncEnd(int dmabuf_fd) {
+  struct local_dma_buf_sync sync_end = {0};
+
+  sync_end.flags = LOCAL_DMA_BUF_SYNC_END | LOCAL_DMA_BUF_SYNC_WRITE;
+  if (drmIoctl(dmabuf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_end))
+    PLOG(ERROR) << "fail to sync end dma buf fd";
+}
+
+}  // namespace
+
 // static
 scoped_ptr<ClientNativePixmap> ClientNativePixmapDmaBuf::ImportFromDmabuf(
     int dmabuf_fd,
     const gfx::Size& size,
     int stride) {
   DCHECK_GE(dmabuf_fd, 0);
   return make_scoped_ptr(new ClientNativePixmapDmaBuf(dmabuf_fd, size, stride));
 }
 
 ClientNativePixmapDmaBuf::ClientNativePixmapDmaBuf(int dmabuf_fd,
                                                    const gfx::Size& size,
                                                    int stride)
-    : size_(size), stride_(stride) {
+    : dmabuf_fd_(dmabuf_fd), size_(size), stride_(stride) {
   TRACE_EVENT0("drm", "ClientNativePixmapDmaBuf");
   size_t map_size = stride_ * size_.height();
   data_ = mmap(nullptr, map_size, (PROT_READ | PROT_WRITE), MAP_SHARED,
                dmabuf_fd, 0);
   CHECK_NE(data_, MAP_FAILED);
 }
 
 ClientNativePixmapDmaBuf::~ClientNativePixmapDmaBuf() {
   TRACE_EVENT0("drm", "~ClientNativePixmapDmaBuf");
   size_t size = stride_ * size_.height();
   int ret = munmap(data_, size);
   DCHECK(!ret);
 }
 
 void* ClientNativePixmapDmaBuf::Map() {
+  TRACE_EVENT0("drm", "DmaBuf:Map");
+  PrimeSyncStart(dmabuf_fd_.get());
   return data_;
 }
 
-void ClientNativePixmapDmaBuf::Unmap() {}
+void ClientNativePixmapDmaBuf::Unmap() {
+  TRACE_EVENT0("drm", "DmaBuf:Unmap");
+  PrimeSyncEnd(dmabuf_fd_.get());
+}
 
 void ClientNativePixmapDmaBuf::GetStride(int* stride) const {
   *stride = stride_;
 }
 
 }  // namespace ui