ui/ozone/platform/dri/ozone_platform_dri.cc - Issue 905873003: [8/8][Ozone-Dri] Pass DRM FD to GPU process on hotplug event

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: . 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 side-by-side diff with in-line comments

Download patch

« ui/ozone/platform/dri/native_display_delegate_proxy.cc ('K') | « ui/ozone/platform/dri/native_display_delegate_proxy.cc ('k') | ui/ozone/platform/dri/ozone_platform_gbm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/ozone/platform/dri/ozone_platform_dri.cc

diff --git a/ui/ozone/platform/dri/ozone_platform_dri.cc b/ui/ozone/platform/dri/ozone_platform_dri.cc

index 8ffcabe719e8adf874f045e21fbd918f61f627e1..cf9f232ec628a3c31fbc1d39bc29402f765c8baa 100644

--- a/ui/ozone/platform/dri/ozone_platform_dri.cc

+++ b/ui/ozone/platform/dri/ozone_platform_dri.cc

@@ -22,6 +22,7 @@

#include "ui/ozone/platform/dri/dri_window_delegate_manager.h"

#include "ui/ozone/platform/dri/dri_window_manager.h"

#include "ui/ozone/platform/dri/dri_wrapper.h"

+#include "ui/ozone/platform/dri/drm_device_generator.h"

#include "ui/ozone/platform/dri/drm_device_manager.h"

#include "ui/ozone/platform/dri/native_display_delegate_dri.h"

#include "ui/ozone/platform/dri/native_display_delegate_proxy.h"

@@ -99,8 +100,9 @@ class OzonePlatformDri : public OzonePlatform {

display_manager_.reset(new DisplayManager());

surface_factory_ozone_.reset(

new DriSurfaceFactory(&window_delegate_manager_));

- scoped_ptr<NativeDisplayDelegateDri> ndd(

- new NativeDisplayDelegateDri(screen_manager_.get(), dri_));

+ scoped_ptr<NativeDisplayDelegateDri> ndd(new NativeDisplayDelegateDri(

+ screen_manager_.get(), dri_,

+ scoped_ptr<DrmDeviceGenerator>(new DrmDeviceGenerator())));

gpu_platform_support_.reset(new DriGpuPlatformSupport(

drm_device_manager_.get(), &window_delegate_manager_,

screen_manager_.get(), ndd.Pass()));