[2/4]Allow hotplugging of primary DRM device

ui/ozone/platform/drm/ozone_platform_gbm.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/ozone_platform_gbm.h"
 
 #include <dlfcn.h>
 #include <gbm.h>
 #include <stdlib.h>
 
@@ skipping 125 matching lines @@
     scoped_ptr<DrmWindowHost> platform_window(
         new DrmWindowHost(delegate, bounds, gpu_platform_support_host_.get(),
                           event_factory_ozone_.get(), cursor_.get(),
                           window_manager_.get(), display_manager_.get()));
     platform_window->Initialize();
     return platform_window.Pass();
   }
   scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
     return make_scoped_ptr(new DrmNativeDisplayDelegate(
         gpu_platform_support_host_.get(), device_manager_.get(),
-        display_manager_.get(), primary_graphics_card_path_));
+        display_manager_.get(), GetPrimaryDisplayCardPath()));
   }
   void InitializeUI() override {
-    primary_graphics_card_path_ = GetPrimaryDisplayCardPath();
     display_manager_.reset(new DisplayManager());
     // Needed since the browser process creates the accelerated widgets and that
     // happens through SFO.
     if (!surface_factory_ozone_)
       surface_factory_ozone_.reset(new GbmSurfaceFactory(use_surfaceless_));
     device_manager_ = CreateDeviceManager();
     window_manager_.reset(new DrmWindowHostManager());
     cursor_.reset(new DrmCursor(window_manager_.get()));
     gpu_platform_support_host_.reset(
         new DrmGpuPlatformSupportHost(cursor_.get()));
     cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
 #if defined(USE_XKBCOMMON)
     KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr(
         new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_)));
 #else
     KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
         make_scoped_ptr(new StubKeyboardLayoutEngine()));
 #endif
     event_factory_ozone_.reset(new EventFactoryEvdev(
         cursor_.get(), device_manager_.get(),
         KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()));
   }
 
   void InitializeGPU() override {
 #if defined(OS_CHROMEOS)
     gpu_lock_.reset(new GpuLock());
 #endif
     gl_api_loader_.reset(new GlApiLoader());
-    // Async page flips are supported only on surfaceless mode.
-    gbm_ = new GbmDevice(GetPrimaryDisplayCardPath());
-    if (!gbm_->Initialize())
-      LOG(FATAL) << "Failed to initialize primary DRM device";
-
-    drm_device_manager_.reset(new DrmDeviceManager(gbm_));
+    drm_device_manager_.reset(new DrmDeviceManager(
+        scoped_ptr<DrmDeviceGenerator>(new GbmDeviceGenerator())));
     buffer_generator_.reset(new GbmBufferGenerator());
     screen_manager_.reset(new ScreenManager(buffer_generator_.get()));
-    // This makes sure that simple targets that do not handle display
-    // configuration can still use the primary display.
-    ForceInitializationOfPrimaryDisplay(gbm_, screen_manager_.get());
-
     if (!surface_factory_ozone_)
       surface_factory_ozone_.reset(new GbmSurfaceFactory(use_surfaceless_));
 
     surface_factory_ozone_->InitializeGpu(drm_device_manager_.get(),
                                           screen_manager_.get());
     scoped_ptr<DrmGpuDisplayManager> ndd(new DrmGpuDisplayManager(
-        screen_manager_.get(), gbm_,
-        scoped_ptr<DrmDeviceGenerator>(new GbmDeviceGenerator())));
+        screen_manager_.get(), drm_device_manager_.get()));
     gpu_platform_support_.reset(new DrmGpuPlatformSupport(
         drm_device_manager_.get(), screen_manager_.get(), ndd.Pass()));
   }
 
  private:
   // Objects in both processes.
   bool use_surfaceless_;
   scoped_ptr<GbmSurfaceFactory> surface_factory_ozone_;
 
   // Objects in the GPU process.
   scoped_ptr<GpuLock> gpu_lock_;
   scoped_ptr<GlApiLoader> gl_api_loader_;
-  scoped_refptr<GbmDevice> gbm_;
   scoped_ptr<DrmDeviceManager> drm_device_manager_;
   scoped_ptr<GbmBufferGenerator> buffer_generator_;
   scoped_ptr<ScreenManager> screen_manager_;
   scoped_ptr<DrmGpuPlatformSupport> gpu_platform_support_;
 
   // Objects in the Browser process.
-  base::FilePath primary_graphics_card_path_;
   scoped_ptr<DeviceManager> device_manager_;
   scoped_ptr<BitmapCursorFactoryOzone> cursor_factory_ozone_;
   scoped_ptr<DrmWindowHostManager> window_manager_;
   scoped_ptr<DrmCursor> cursor_;
   scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
   scoped_ptr<DrmGpuPlatformSupportHost> gpu_platform_support_host_;
   scoped_ptr<DisplayManager> display_manager_;
 
 #if defined(USE_XKBCOMMON)
   XkbEvdevCodes xkb_evdev_code_converter_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm);
 };
 
 }  // namespace
 
 OzonePlatform* CreateOzonePlatformGbm() {
   base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
 #if defined(USE_MESA_PLATFORM_NULL)
   // Only works with surfaceless.
   cmd->AppendSwitch(switches::kOzoneUseSurfaceless);
 #endif
   return new OzonePlatformGbm(cmd->HasSwitch(switches::kOzoneUseSurfaceless));
 }
 
 }  // namespace ui