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

Unified Diff: ui/ozone/platform/drm/gpu/drm_device_manager.h

Issue 1124063003: drm: GPU process manages VGEM fd. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase to ToT Created 5 years, 7 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
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_device.cc ('k') | ui/ozone/platform/drm/gpu/drm_device_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/drm/gpu/drm_device_manager.h
diff --git a/ui/ozone/platform/drm/gpu/drm_device_manager.h b/ui/ozone/platform/drm/gpu/drm_device_manager.h
index 34fe61335d62cb1bb9165d8ef3d7ea0467130f68..07d1c979ed3f24f74b736ac54bf55da69e8c298b 100644
--- a/ui/ozone/platform/drm/gpu/drm_device_manager.h
+++ b/ui/ozone/platform/drm/gpu/drm_device_manager.h
@@ -24,6 +24,7 @@ class SingleThreadTaskRunner;
namespace ui {
class DrmDevice;
+class DrmDeviceBase;
class DrmDeviceGenerator;
typedef std::vector<scoped_refptr<DrmDevice>> DrmDeviceVector;
@@ -40,6 +41,8 @@ class OZONE_EXPORT DrmDeviceManager {
// The first device registered is assumed to be the primary device.
bool AddDrmDevice(const base::FilePath& path, const base::FileDescriptor& fd);
void RemoveDrmDevice(const base::FilePath& path);
+ bool AddVgemDevice(const base::FilePath& path,
+ const base::FileDescriptor& fd);
void InitializeIOTaskRunner(
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
@@ -55,7 +58,9 @@ class OZONE_EXPORT DrmDeviceManager {
// returns |primary_device_|.
scoped_refptr<DrmDevice> GetDrmDevice(gfx::AcceleratedWidget widget);
- const DrmDeviceVector& GetDrmDevices() const;
+ DrmDeviceVector GetDrmDevices() const;
+
+ scoped_refptr<DrmDeviceBase> GetVgemDevice() const;
private:
// With the exception of GetDrmDevice() all functions must be called on GPU
@@ -66,7 +71,7 @@ class OZONE_EXPORT DrmDeviceManager {
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
- DrmDeviceVector devices_;
+ std::vector<scoped_refptr<DrmDeviceBase>> devices_;
std::map<gfx::AcceleratedWidget, scoped_refptr<DrmDevice>> drm_device_map_;
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_device.cc ('k') | ui/ozone/platform/drm/gpu/drm_device_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698