[8/8][Ozone-Dri] Pass DRM FD to GPU process on hotplug event

ui/ozone/platform/dri/native_display_delegate_dri.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/native_display_delegate_dri.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/file_descriptor_posix.h"
+#include "base/files/file.h"
 #include "base/single_thread_task_runner.h"
 #include "ui/display/types/native_display_observer.h"
 #include "ui/events/ozone/device/device_event.h"
 #include "ui/ozone/common/display_util.h"
 #include "ui/ozone/platform/dri/display_mode_dri.h"
 #include "ui/ozone/platform/dri/display_snapshot_dri.h"
 #include "ui/ozone/platform/dri/dri_util.h"
 #include "ui/ozone/platform/dri/dri_wrapper.h"
+#include "ui/ozone/platform/dri/drm_device_generator.h"
 #include "ui/ozone/platform/dri/screen_manager.h"
 #include "ui/ozone/public/ozone_switches.h"
 
 namespace ui {
 
 namespace {
 
 const char kContentProtection[] = "Content Protection";
 
 struct ContentProtectionMapping {
@@ skipping 40 matching lines @@
     return drm_ == other->drm() && connector_ == other->connector() &&
            crtc_ == other->crtc();
   }
 
  private:
   scoped_refptr<DriWrapper> drm_;
   uint32_t crtc_;
   uint32_t connector_;
 };
 
+class FindByDevicePath {
+ public:
+  explicit FindByDevicePath(const base::FilePath& path) : path_(path) {}
+
+  bool operator()(const scoped_refptr<DriWrapper>& device) {
+    return device->device_path() == path_;
+  }
+
+ private:
+  base::FilePath path_;
+};
+
 }  // namespace
 
 NativeDisplayDelegateDri::NativeDisplayDelegateDri(
     ScreenManager* screen_manager,
-    const scoped_refptr<DriWrapper>& primary_device)
-    : screen_manager_(screen_manager) {
+    const scoped_refptr<DriWrapper>& primary_device,
+    scoped_ptr<DrmDeviceGenerator> drm_device_generator)
+    : screen_manager_(screen_manager),
+      drm_device_generator_(drm_device_generator.Pass()) {
   devices_.push_back(primary_device);
 }
 
 NativeDisplayDelegateDri::~NativeDisplayDelegateDri() {
 }
 
 void NativeDisplayDelegateDri::ForceDPMSOn() {
   for (size_t i = 0; i < cached_displays_.size(); ++i) {
     DisplaySnapshotDri* dri_output = cached_displays_[i];
     if (dri_output->dpms_property())
@@ skipping 95 matching lines @@
 bool NativeDisplayDelegateDri::RelinquishDisplayControl() {
   for (const auto& drm : devices_) {
     if (!drm->DropMaster()) {
       LOG(ERROR) << "Failed to relinquish control of the display";
       return false;
     }
   }
   return true;
 }
 
-void NativeDisplayDelegateDri::AddGraphicsDevice(const base::FilePath& path) {
-  NOTIMPLEMENTED();
+void NativeDisplayDelegateDri::AddGraphicsDevice(
+    const base::FilePath& path,
+    const base::FileDescriptor& fd) {
+  base::File file(fd.fd);
+  auto it =
+      std::find_if(devices_.begin(), devices_.end(), FindByDevicePath(path));
+  if (it != devices_.end())

[spang, 2015/02/12 18:02:46]

maybe warn?

[dnicoara, 2015/02/12 18:11:19]

Done.

+    return;
+
+  scoped_refptr<DriWrapper> device =
+      drm_device_generator_->CreateDevice(path, file.Pass());
+  devices_.push_back(device);
+  if (io_task_runner_)
+    device->InitializeTaskRunner(io_task_runner_);
 }
 
 void NativeDisplayDelegateDri::RemoveGraphicsDevice(
     const base::FilePath& path) {
-  NOTIMPLEMENTED();
+  auto it =
+      std::find_if(devices_.begin(), devices_.end(), FindByDevicePath(path));
+  if (it == devices_.end()) {
+    LOG(ERROR) << "Got request to remove non-existent device '" << path.value()
+               << "'";
+    return;
+  }
+
+  devices_.erase(it);
 }
 
 DisplaySnapshotDri* NativeDisplayDelegateDri::FindDisplaySnapshot(int64_t id) {
   for (size_t i = 0; i < cached_displays_.size(); ++i)
     if (cached_displays_[i]->display_id() == id)
       return cached_displays_[i];
 
   return NULL;
 }
 
@@ skipping 153 matching lines @@
 
     if (it == old_displays.end()) {
       screen_manager_->AddDisplayController(new_displays[i]->drm(),
                                             new_displays[i]->crtc(),
                                             new_displays[i]->connector());
     }
   }
 }
 
 }  // namespace ui