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

Unified Diff: ui/ozone/platform/dri/ozone_platform_gbm.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 side-by-side diff with in-line comments
Download patch
Index: ui/ozone/platform/dri/ozone_platform_gbm.cc
diff --git a/ui/ozone/platform/dri/ozone_platform_gbm.cc b/ui/ozone/platform/dri/ozone_platform_gbm.cc
index 03c2b22c12d6af1195fbed7cafd27a1d9e9cd6b6..856ac029b6a6bc2d19bda1b802f892dd33005cf5 100644
--- a/ui/ozone/platform/dri/ozone_platform_gbm.cc
+++ b/ui/ozone/platform/dri/ozone_platform_gbm.cc
@@ -23,6 +23,7 @@
#include "ui/ozone/platform/dri/dri_window.h"
#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_generator.h"
#include "ui/ozone/platform/dri/drm_device_manager.h"
#include "ui/ozone/platform/dri/gbm_buffer.h"
#include "ui/ozone/platform/dri/gbm_surface.h"
@@ -76,6 +77,7 @@ class GbmBufferGenerator : public ScanoutBufferGenerator {
GbmBufferGenerator() {}
~GbmBufferGenerator() override {}
+ // ScanoutBufferGenerator:
scoped_refptr<ScanoutBuffer> Create(const scoped_refptr<DriWrapper>& drm,
const gfx::Size& size) override {
scoped_refptr<GbmWrapper> gbm(static_cast<GbmWrapper*>(drm.get()));
@@ -87,6 +89,23 @@ class GbmBufferGenerator : public ScanoutBufferGenerator {
DISALLOW_COPY_AND_ASSIGN(GbmBufferGenerator);
};
+class GbmWrapperGenerator : public DriWrapperGenerator {
+ public:
+ GbmWrapperGenerator() {}
+ ~GbmWrapperGenerator() override {}
+
+ // DriWrapperGenerator:
+ scoped_refptr<DriWrapper> CreateWrapper(const base::FilePath& path,
+ base::File file) override {
+ scoped_refptr<DriWrapper> drm = new GbmWrapper(path, file.Pass());
+ drm->Initialize();
+ return drm;
+ }
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(GbmWrapperGenerator);
+};
+
class OzonePlatformGbm : public OzonePlatform {
public:
OzonePlatformGbm(bool use_surfaceless) : use_surfaceless_(use_surfaceless) {
@@ -175,7 +194,8 @@ class OzonePlatformGbm : public OzonePlatform {
ndd->Initialize();
gpu_platform_support_.reset(new DriGpuPlatformSupport(
gbm_, drm_device_manager_.get(), window_delegate_manager_.get(),
- screen_manager_.get(), ndd.Pass()));
+ screen_manager_.get(), ndd.Pass(),
+ scoped_ptr<DriWrapperGenerator>(new GbmWrapperGenerator())));
}
private:

Powered by Google App Engine
This is Rietveld 408576698