[Ozone-DRI] Re-enable GBM surface mode support

ui/ozone/platform/dri/dri_wrapper.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/dri/dri_wrapper.h"
 
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <unistd.h>
 #include <xf86drm.h>
@@ skipping 126 matching lines @@
 
   void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); }
 
   scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
 
   base::MessagePumpLibevent::FileDescriptorWatcher controller_;
 
   DISALLOW_COPY_AND_ASSIGN(IOWatcher);
 };
 
-DriWrapper::DriWrapper(const char* device_path, bool software_mode)
+DriWrapper::DriWrapper(const char* device_path, bool use_sync_flips)
     : fd_(-1),
-      software_mode_(software_mode),
+      use_sync_flips_(use_sync_flips),
       device_path_(device_path),
       io_thread_("DriIOThread") {
   plane_manager_.reset(new HardwareDisplayPlaneManagerLegacy());
 }
 
 DriWrapper::~DriWrapper() {
   if (fd_ >= 0)
     close(fd_);
 
   if (watcher_)
     watcher_->Shutdown();
 }
 
 void DriWrapper::Initialize() {
   fd_ = open(device_path_, O_RDWR | O_CLOEXEC);
   if (fd_ < 0)
     PLOG(FATAL) << "open: " << device_path_;
   if (!plane_manager_->Initialize(this))
     LOG(ERROR) << "Failed to initialize the plane manager";
 }
 
 void DriWrapper::InitializeIOWatcher() {
-  if (!software_mode_ && !watcher_) {
+  if (!use_sync_flips_ && !watcher_) {
     if (!io_thread_.StartWithOptions(
             base::Thread::Options(base::MessageLoop::TYPE_IO, 0)))
       LOG(FATAL) << "Failed to start the IO helper thread";
 
     watcher_ = new IOWatcher(fd_, io_thread_.task_runner());
   }
 }
 
 ScopedDrmCrtcPtr DriWrapper::GetCrtc(uint32_t crtc_id) {
   DCHECK(fd_ >= 0);
@@ skipping 88 matching lines @@
                "framebuffer", framebuffer);
 
   // NOTE: Calling drmModeSetCrtc will immediately update the state, though
   // callbacks to already scheduled page flips will be honored by the kernel.
   scoped_ptr<PageFlipPayload> payload(
       new PageFlipPayload(base::ThreadTaskRunnerHandle::Get(), callback));
   if (!drmModePageFlip(fd_, crtc_id, framebuffer, DRM_MODE_PAGE_FLIP_EVENT,
                        payload.get())) {
     // If successful the payload will be removed by a PageFlip event.
     ignore_result(payload.release());
-    if (software_mode_) {
+    if (use_sync_flips_) {
       TRACE_EVENT1("dri", "OnDrmEvent", "socket", fd_);
 
       drmEventContext event;
       event.version = DRM_EVENT_CONTEXT_VERSION;
       event.page_flip_handler = HandlePageFlipEventOnUI;
       event.vblank_handler = nullptr;
 
       drmHandleEvent(fd_, &event);
     } else {
       InitializeIOWatcher();
@@ skipping 121 matching lines @@
   DCHECK(fd_ >= 0);
   return (drmSetMaster(fd_) == 0);
 }
 
 bool DriWrapper::DropMaster() {
   DCHECK(fd_ >= 0);
   return (drmDropMaster(fd_) == 0);
 }
 
 }  // namespace ui