[Ozone-Drm] Move DRM utilities from gpu/ to common/

These will need to be shared between browser and gpu code since we'll need to read the initial display configuration synchronously on the browser side. BUG=484294 Review URL: https://codereview.chromium.org/1133053003 Cr-Commit-Position: refs/heads/master@{#329218}
FairyWorld · May 11, 2015 · c6a02fc · c6a02fc
1 parent 03d9f48
commit c6a02fc
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 56 deletions.
diff --git a/ui/ozone/platform/drm/BUILD.gn b/ui/ozone/platform/drm/BUILD.gn
@@ -16,6 +16,10 @@ pkg_config("libdrm") {
 
 source_set("drm_common") {
   sources = [
+    "common/drm_util.cc",
+    "common/drm_util.h",
+    "common/scoped_drm_types.cc",
+    "common/scoped_drm_types.h",
     "drm_surface_factory.cc",
     "drm_surface_factory.h",
     "gpu/crtc_controller.cc",
@@ -41,8 +45,6 @@ source_set("drm_common") {
     "gpu/drm_gpu_platform_support.h",
     "gpu/drm_surface.cc",
     "gpu/drm_surface.h",
-    "gpu/drm_util.cc",
-    "gpu/drm_util.h",
     "gpu/drm_vsync_provider.cc",
     "gpu/drm_vsync_provider.h",
     "gpu/drm_window.cc",
@@ -62,8 +64,6 @@ source_set("drm_common") {
     "gpu/page_flip_request.cc",
     "gpu/page_flip_request.h",
     "gpu/scanout_buffer.h",
-    "gpu/scoped_drm_types.cc",
-    "gpu/scoped_drm_types.h",
     "gpu/screen_manager.cc",
     "gpu/screen_manager.h",
     "host/channel_observer.h",

diff --git a/ui/ozone/platform/drm/gpu/drm_util.cc → ui/ozone/platform/drm/common/drm_util.cc b/ui/ozone/platform/drm/gpu/drm_util.cc → ui/ozone/platform/drm/common/drm_util.cc
@@ -2,16 +2,13 @@
 // 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_util.h"
+#include "ui/ozone/platform/drm/common/drm_util.h"
 
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <xf86drmMode.h>
 
-#include "ui/ozone/platform/drm/gpu/drm_device.h"
-#include "ui/ozone/platform/drm/gpu/screen_manager.h"
-
 namespace ui {
 
 namespace {
@@ -103,20 +100,4 @@ bool SameMode(const drmModeModeInfo& lhs, const drmModeModeInfo& rhs) {
          lhs.flags == rhs.flags && strcmp(lhs.name, rhs.name) == 0;
 }
 
-void ForceInitializationOfPrimaryDisplay(const scoped_refptr<DrmDevice>& drm,
-                                         ScreenManager* screen_manager) {
-  VLOG(2) << "Forcing initialization of primary display.";
-  ScopedVector<HardwareDisplayControllerInfo> displays =
-      GetAvailableDisplayControllerInfos(drm->get_fd());
-
-  if (displays.empty())
-    return;
-
-  screen_manager->AddDisplayController(drm, displays[0]->crtc()->crtc_id,
-                                       displays[0]->connector()->connector_id);
-  screen_manager->ConfigureDisplayController(
-      drm, displays[0]->crtc()->crtc_id, displays[0]->connector()->connector_id,
-      gfx::Point(), displays[0]->connector()->modes[0]);
-}
-
 }  // namespace ui
diff --git a/ui/ozone/platform/drm/gpu/drm_util.h → ui/ozone/platform/drm/common/drm_util.h b/ui/ozone/platform/drm/gpu/drm_util.h → ui/ozone/platform/drm/common/drm_util.h
@@ -2,22 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_UTIL_H_
-#define UI_OZONE_PLATFORM_DRM_GPU_DRM_UTIL_H_
+#ifndef UI_OZONE_PLATFORM_DRM_COMMON_DRM_UTIL_H_
+#define UI_OZONE_PLATFORM_DRM_COMMON_DRM_UTIL_H_
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
-#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
-#include "ui/ozone/platform/drm/gpu/scoped_drm_types.h"
+#include "ui/ozone/platform/drm/common/scoped_drm_types.h"
 
 typedef struct _drmModeModeInfo drmModeModeInfo;
 
 namespace ui {
 
-class DrmDevice;
-class ScreenManager;
-
 // Representation of the information required to initialize and configure a
 // native display.
 class HardwareDisplayControllerInfo {
@@ -43,9 +39,6 @@ ScopedVector<HardwareDisplayControllerInfo> GetAvailableDisplayControllerInfos(
 
 bool SameMode(const drmModeModeInfo& lhs, const drmModeModeInfo& rhs);
 
-void ForceInitializationOfPrimaryDisplay(const scoped_refptr<DrmDevice>& drm,
-                                         ScreenManager* screen_manager);
-
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRM_GPU_DRM_UTIL_H_
+#endif  // UI_OZONE_PLATFORM_DRM_COMMON_DRM_UTIL_H_
diff --git a/...zone/platform/drm/gpu/scoped_drm_types.cc → ...e/platform/drm/common/scoped_drm_types.cc b/...zone/platform/drm/gpu/scoped_drm_types.cc → ...e/platform/drm/common/scoped_drm_types.cc
@@ -2,7 +2,7 @@
 // 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/scoped_drm_types.h"
+#include "ui/ozone/platform/drm/common/scoped_drm_types.h"
 
 #include <xf86drmMode.h>
 

diff --git a/ui/ozone/platform/drm/gpu/scoped_drm_types.h → ...ne/platform/drm/common/scoped_drm_types.h b/ui/ozone/platform/drm/gpu/scoped_drm_types.h → ...ne/platform/drm/common/scoped_drm_types.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRM_GPU_SCOPED_DRM_TYPES_H_
-#define UI_OZONE_PLATFORM_DRM_GPU_SCOPED_DRM_TYPES_H_
+#ifndef UI_OZONE_PLATFORM_DRM_COMMON_SCOPED_DRM_TYPES_H_
+#define UI_OZONE_PLATFORM_DRM_COMMON_SCOPED_DRM_TYPES_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/ozone/ozone_export.h"
@@ -77,4 +77,4 @@ typedef scoped_ptr<drmModeFB, DrmFramebufferDeleter> ScopedDrmFramebufferPtr;
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRM_GPU_SCOPED_DRM_TYPES_H_
+#endif  // UI_OZONE_PLATFORM_DRM_COMMON_SCOPED_DRM_TYPES_H_
diff --git a/ui/ozone/platform/drm/drm.gypi b/ui/ozone/platform/drm/drm.gypi
@@ -38,6 +38,10 @@
         'OZONE_IMPLEMENTATION',
       ],
       'sources': [
+        'common/drm_util.cc',
+        'common/drm_util.h',
+        'common/scoped_drm_types.cc',
+        'common/scoped_drm_types.h',
         'drm_surface_factory.cc',
         'drm_surface_factory.h',
         'gpu/crtc_controller.cc',
@@ -63,8 +67,6 @@
         'gpu/drm_gpu_platform_support.h',
         'gpu/drm_surface.cc',
         'gpu/drm_surface.h',
-        'gpu/drm_util.cc',
-        'gpu/drm_util.h',
         'gpu/drm_vsync_provider.cc',
         'gpu/drm_vsync_provider.h',
         'gpu/drm_window.cc',
@@ -83,8 +85,6 @@
         'gpu/overlay_plane.h',
         'gpu/page_flip_request.cc',
         'gpu/page_flip_request.h',
-        'gpu/scoped_drm_types.cc',
-        'gpu/scoped_drm_types.h',
         'gpu/screen_manager.cc',
         'gpu/screen_manager.h',
         'host/channel_observer.h',

diff --git a/ui/ozone/platform/drm/drm_surface_factory.cc b/ui/ozone/platform/drm/drm_surface_factory.cc
@@ -7,8 +7,8 @@
 #include <errno.h>
 
 #include "ui/gfx/native_widget_types.h"
+#include "ui/ozone/platform/drm/common/drm_util.h"
 #include "ui/ozone/platform/drm/gpu/drm_surface.h"
-#include "ui/ozone/platform/drm/gpu/drm_util.h"
 #include "ui/ozone/platform/drm/gpu/drm_window.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
 #include "ui/ozone/platform/drm/gpu/screen_manager.h"

diff --git a/ui/ozone/platform/drm/gpu/crtc_controller.h b/ui/ozone/platform/drm/gpu/crtc_controller.h
@@ -12,9 +12,9 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "ui/ozone/ozone_export.h"
+#include "ui/ozone/platform/drm/common/scoped_drm_types.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h"
 #include "ui/ozone/platform/drm/gpu/overlay_plane.h"
-#include "ui/ozone/platform/drm/gpu/scoped_drm_types.h"
 
 namespace ui {
 

diff --git a/ui/ozone/platform/drm/gpu/drm_console_buffer.cc b/ui/ozone/platform/drm/gpu/drm_console_buffer.cc
@@ -8,8 +8,8 @@
 #include <xf86drmMode.h>
 
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "ui/ozone/platform/drm/common/scoped_drm_types.h"
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
-#include "ui/ozone/platform/drm/gpu/scoped_drm_types.h"
 
 namespace ui {
 

diff --git a/ui/ozone/platform/drm/gpu/drm_device.cc b/ui/ozone/platform/drm/gpu/drm_device.cc
@@ -19,7 +19,7 @@
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "ui/display/types/gamma_ramp_rgb_entry.h"
-#include "ui/ozone/platform/drm/gpu/drm_util.h"
+#include "ui/ozone/platform/drm/common/drm_util.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.h"
 
 #if defined(USE_DRM_ATOMIC)

diff --git a/ui/ozone/platform/drm/gpu/drm_device.h b/ui/ozone/platform/drm/gpu/drm_device.h
@@ -19,8 +19,8 @@
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/overlay_transform.h"
 #include "ui/ozone/ozone_export.h"
+#include "ui/ozone/platform/drm/common/scoped_drm_types.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h"
-#include "ui/ozone/platform/drm/gpu/scoped_drm_types.h"
 
 typedef struct _drmEventContext drmEventContext;
 typedef struct _drmModeModeInfo drmModeModeInfo;

diff --git a/ui/ozone/platform/drm/gpu/drm_display_snapshot.cc b/ui/ozone/platform/drm/gpu/drm_display_snapshot.cc
@@ -12,9 +12,9 @@
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "ui/display/util/edid_parser.h"
+#include "ui/ozone/platform/drm/common/drm_util.h"
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
 #include "ui/ozone/platform/drm/gpu/drm_display_mode.h"
-#include "ui/ozone/platform/drm/gpu/drm_util.h"
 
 #if !defined(DRM_MODE_CONNECTOR_DSI)
 #define DRM_MODE_CONNECTOR_DSI 16

diff --git a/ui/ozone/platform/drm/gpu/drm_display_snapshot.h b/ui/ozone/platform/drm/gpu/drm_display_snapshot.h
@@ -7,7 +7,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "ui/display/types/display_snapshot.h"
-#include "ui/ozone/platform/drm/gpu/scoped_drm_types.h"
+#include "ui/ozone/platform/drm/common/scoped_drm_types.h"
 
 namespace ui {
 

diff --git a/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc b/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc
@@ -13,11 +13,11 @@
 #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/drm/common/drm_util.h"
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
 #include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
 #include "ui/ozone/platform/drm/gpu/drm_display_mode.h"
 #include "ui/ozone/platform/drm/gpu/drm_display_snapshot.h"
-#include "ui/ozone/platform/drm/gpu/drm_util.h"
 #include "ui/ozone/platform/drm/gpu/screen_manager.h"
 #include "ui/ozone/public/ozone_switches.h"
 

diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane.h b/ui/ozone/platform/drm/gpu/hardware_display_plane.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "ui/ozone/ozone_export.h"
-#include "ui/ozone/platform/drm/gpu/scoped_drm_types.h"
+#include "ui/ozone/platform/drm/common/scoped_drm_types.h"
 
 namespace gfx {
 class Rect;

diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h
@@ -13,9 +13,9 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/ozone/ozone_export.h"
+#include "ui/ozone/platform/drm/common/scoped_drm_types.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_plane.h"
 #include "ui/ozone/platform/drm/gpu/overlay_plane.h"
-#include "ui/ozone/platform/drm/gpu/scoped_drm_types.h"
 
 namespace gfx {
 class Rect;

diff --git a/ui/ozone/platform/drm/gpu/screen_manager.cc b/ui/ozone/platform/drm/gpu/screen_manager.cc
@@ -10,10 +10,10 @@
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
+#include "ui/ozone/platform/drm/common/drm_util.h"
 #include "ui/ozone/platform/drm/gpu/crtc_controller.h"
 #include "ui/ozone/platform/drm/gpu/drm_console_buffer.h"
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
-#include "ui/ozone/platform/drm/gpu/drm_util.h"
 #include "ui/ozone/platform/drm/gpu/drm_window.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
 #include "ui/ozone/platform/drm/gpu/scanout_buffer.h"

diff --git a/ui/ozone/platform/drm/ozone_platform_drm.cc b/ui/ozone/platform/drm/ozone_platform_drm.cc
@@ -11,14 +11,14 @@
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
+#include "ui/ozone/platform/drm/common/drm_util.h"
 #include "ui/ozone/platform/drm/drm_surface_factory.h"
 #include "ui/ozone/platform/drm/gpu/drm_buffer.h"
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
 #include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
 #include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
 #include "ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h"
 #include "ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h"
-#include "ui/ozone/platform/drm/gpu/drm_util.h"
 #include "ui/ozone/platform/drm/gpu/drm_window.h"
 #include "ui/ozone/platform/drm/gpu/gpu_lock.h"
 #include "ui/ozone/platform/drm/gpu/screen_manager.h"

diff --git a/ui/ozone/platform/drm/ozone_platform_gbm.cc b/ui/ozone/platform/drm/ozone_platform_gbm.cc
@@ -15,12 +15,12 @@
 #include "ui/events/ozone/device/device_manager.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
+#include "ui/ozone/platform/drm/common/drm_util.h"
 #include "ui/ozone/platform/drm/gbm_surface_factory.h"
 #include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
 #include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
 #include "ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h"
 #include "ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h"
-#include "ui/ozone/platform/drm/gpu/drm_util.h"
 #include "ui/ozone/platform/drm/gpu/gbm_buffer.h"
 #include "ui/ozone/platform/drm/gpu/gbm_device.h"
 #include "ui/ozone/platform/drm/gpu/gbm_surface.h"