Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Side by Side Diff: ui/ozone/platform/dri/ozone_platform_dri.cc

Issue 905873003: [8/8][Ozone-Dri] Pass DRM FD to GPU process on hotplug event (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@udl2.9-allow-ndd-to-handle-multiple-drm-devices
Patch Set: Rebased Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/ozone/platform/dri/ozone_platform_dri.h" 5 #include "ui/ozone/platform/dri/ozone_platform_dri.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h" 8 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
9 #include "ui/events/ozone/device/device_manager.h" 9 #include "ui/events/ozone/device/device_manager.h"
10 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h" 10 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
11 #include "ui/events/ozone/evdev/event_factory_evdev.h" 11 #include "ui/events/ozone/evdev/event_factory_evdev.h"
12 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h" 12 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
13 #include "ui/ozone/platform/dri/display_manager.h" 13 #include "ui/ozone/platform/dri/display_manager.h"
14 #include "ui/ozone/platform/dri/dri_buffer.h" 14 #include "ui/ozone/platform/dri/dri_buffer.h"
15 #include "ui/ozone/platform/dri/dri_cursor.h" 15 #include "ui/ozone/platform/dri/dri_cursor.h"
16 #include "ui/ozone/platform/dri/dri_gpu_platform_support.h" 16 #include "ui/ozone/platform/dri/dri_gpu_platform_support.h"
17 #include "ui/ozone/platform/dri/dri_gpu_platform_support_host.h" 17 #include "ui/ozone/platform/dri/dri_gpu_platform_support_host.h"
18 #include "ui/ozone/platform/dri/dri_surface_factory.h" 18 #include "ui/ozone/platform/dri/dri_surface_factory.h"
19 #include "ui/ozone/platform/dri/dri_util.h" 19 #include "ui/ozone/platform/dri/dri_util.h"
20 #include "ui/ozone/platform/dri/dri_window.h" 20 #include "ui/ozone/platform/dri/dri_window.h"
21 #include "ui/ozone/platform/dri/dri_window_delegate_impl.h" 21 #include "ui/ozone/platform/dri/dri_window_delegate_impl.h"
22 #include "ui/ozone/platform/dri/dri_window_delegate_manager.h" 22 #include "ui/ozone/platform/dri/dri_window_delegate_manager.h"
23 #include "ui/ozone/platform/dri/dri_window_manager.h" 23 #include "ui/ozone/platform/dri/dri_window_manager.h"
24 #include "ui/ozone/platform/dri/dri_wrapper.h" 24 #include "ui/ozone/platform/dri/dri_wrapper.h"
25 #include "ui/ozone/platform/dri/dri_wrapper_generator.h"
25 #include "ui/ozone/platform/dri/drm_device_manager.h" 26 #include "ui/ozone/platform/dri/drm_device_manager.h"
26 #include "ui/ozone/platform/dri/native_display_delegate_dri.h" 27 #include "ui/ozone/platform/dri/native_display_delegate_dri.h"
27 #include "ui/ozone/platform/dri/native_display_delegate_proxy.h" 28 #include "ui/ozone/platform/dri/native_display_delegate_proxy.h"
28 #include "ui/ozone/platform/dri/screen_manager.h" 29 #include "ui/ozone/platform/dri/screen_manager.h"
29 #include "ui/ozone/public/ozone_platform.h" 30 #include "ui/ozone/public/ozone_platform.h"
30 #include "ui/ozone/public/ui_thread_gpu.h" 31 #include "ui/ozone/public/ui_thread_gpu.h"
31 32
32 #if defined(USE_XKBCOMMON) 33 #if defined(USE_XKBCOMMON)
33 #include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h" 34 #include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h"
34 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h" 35 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 ForceInitializationOfPrimaryDisplay(dri_, screen_manager_.get()); 98 ForceInitializationOfPrimaryDisplay(dri_, screen_manager_.get());
98 drm_device_manager_.reset(new DrmDeviceManager(dri_)); 99 drm_device_manager_.reset(new DrmDeviceManager(dri_));
99 display_manager_.reset(new DisplayManager()); 100 display_manager_.reset(new DisplayManager());
100 surface_factory_ozone_.reset( 101 surface_factory_ozone_.reset(
101 new DriSurfaceFactory(&window_delegate_manager_)); 102 new DriSurfaceFactory(&window_delegate_manager_));
102 scoped_ptr<NativeDisplayDelegateDri> ndd( 103 scoped_ptr<NativeDisplayDelegateDri> ndd(
103 new NativeDisplayDelegateDri(screen_manager_.get())); 104 new NativeDisplayDelegateDri(screen_manager_.get()));
104 ndd->Initialize(); 105 ndd->Initialize();
105 gpu_platform_support_.reset(new DriGpuPlatformSupport( 106 gpu_platform_support_.reset(new DriGpuPlatformSupport(
106 dri_, drm_device_manager_.get(), &window_delegate_manager_, 107 dri_, drm_device_manager_.get(), &window_delegate_manager_,
107 screen_manager_.get(), ndd.Pass())); 108 screen_manager_.get(), ndd.Pass(),
109 scoped_ptr<DriWrapperGenerator>(new DriWrapperGenerator())));
108 gpu_platform_support_host_.reset(new DriGpuPlatformSupportHost()); 110 gpu_platform_support_host_.reset(new DriGpuPlatformSupportHost());
109 window_manager_.reset(new DriWindowManager()); 111 window_manager_.reset(new DriWindowManager());
110 cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone); 112 cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
111 cursor_.reset( 113 cursor_.reset(
112 new DriCursor(window_manager_.get(), gpu_platform_support_host_.get())); 114 new DriCursor(window_manager_.get(), gpu_platform_support_host_.get()));
113 cursor_->Init(); 115 cursor_->Init();
114 #if defined(USE_XKBCOMMON) 116 #if defined(USE_XKBCOMMON)
115 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr( 117 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr(
116 new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_))); 118 new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_)));
117 #else 119 #else
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 DISALLOW_COPY_AND_ASSIGN(OzonePlatformDri); 159 DISALLOW_COPY_AND_ASSIGN(OzonePlatformDri);
158 }; 160 };
159 161
160 } // namespace 162 } // namespace
161 163
162 OzonePlatform* CreateOzonePlatformDri() { 164 OzonePlatform* CreateOzonePlatformDri() {
163 return new OzonePlatformDri; 165 return new OzonePlatformDri;
164 } 166 }
165 167
166 } // namespace ui 168 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698