Preliminary atomic patch

ui/ozone/platform/drm/gpu/drm_device.cc

 // Copyright 2014 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/gpu/drm_device.h"
 
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <unistd.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "ui/ozone/platform/drm/gpu/drm_util.h"
+#if defined(OZONE_USE_ATOMIC)

[dnicoara, 2015/03/16 21:14:11]

move #ifdef include block after the normal includes.

+#include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.h"
+#endif
 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.h"
 
 namespace ui {
 
 namespace {
 
 struct PageFlipPayload {
   PageFlipPayload(const scoped_refptr<base::TaskRunner>& task_runner,
                   const DrmDevice::PageFlipCallback& callback)
       : task_runner(task_runner), callback(callback) {}
@@ skipping 160 matching lines @@
 }
 
 bool DrmDevice::Initialize() {
   // Ignore devices that cannot perform modesetting.
   if (!CanQueryForResources(file_.GetPlatformFile())) {
     VLOG(2) << "Cannot query for resources for '" << device_path_.value()
             << "'";
     return false;
   }
 
+#if defined(OZONE_USE_ATOMIC)
+  plane_manager_.reset(new HardwareDisplayPlaneManagerAtomic());
+#else
   plane_manager_.reset(new HardwareDisplayPlaneManagerLegacy());
+#endif
   if (!plane_manager_->Initialize(this)) {
     LOG(ERROR) << "Failed to initialize the plane manager for "
                << device_path_.value();
     plane_manager_.reset();
     return false;
   }
 
   return true;
 }
 
@@ skipping 219 matching lines @@
 void DrmDevice::DestroyDumbBuffer(const SkImageInfo& info,
                                   uint32_t handle,
                                   uint32_t stride,
                                   void* pixels) {
   DCHECK(file_.IsValid());
   TRACE_EVENT1("drm", "DrmDevice::DestroyDumbBuffer", "handle", handle);
   munmap(pixels, info.getSafeSize(stride));
   DrmDestroyDumbBuffer(file_.GetPlatformFile(), handle);
 }
 
+bool DrmDevice::CommitProperties(drmModePropertySet* properties,
+                                 uint32_t flags,
+                                 const PageFlipCallback& callback) {
+#if defined(OZONE_USE_ATOMIC)
+  scoped_ptr<PageFlipPayload> payload(
+      new PageFlipPayload(base::ThreadTaskRunnerHandle::Get(), callback));
+  if (!drmModePropertySetCommit(file_.GetPlatformFile(), flags, payload.get(),
+                                properties)) {
+    // If successful the payload will be removed by the event
+    ignore_result(payload.release());
+    return true;
+  }
+  return false;
+#else
+  return false;
+#endif
+}
+
 bool DrmDevice::SetMaster() {
   DCHECK(file_.IsValid());
   return (drmSetMaster(file_.GetPlatformFile()) == 0);
 }
 
 bool DrmDevice::DropMaster() {
   DCHECK(file_.IsValid());
   return (drmDropMaster(file_.GetPlatformFile()) == 0);
 }
 
 }  // namespace ui