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

Side by Side Diff: ui/ozone/platform/drm/gpu/drm_device_manager.h

Issue 1311043016: Switch DRM platform to using a separate thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mv-drm-calls-on-thread2
Patch Set: update & fix clang Created 5 years, 2 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_MANAGER_H_ 5 #ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_MANAGER_H_
6 #define UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_MANAGER_H_ 6 #define UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/synchronization/lock.h"
14 #include "base/threading/thread_checker.h"
15 #include "ui/gfx/native_widget_types.h" 13 #include "ui/gfx/native_widget_types.h"
16 #include "ui/ozone/ozone_export.h" 14 #include "ui/ozone/ozone_export.h"
17 15
18 namespace base { 16 namespace base {
19 class FilePath; 17 class FilePath;
20 struct FileDescriptor; 18 struct FileDescriptor;
21 class SingleThreadTaskRunner;
22 } 19 }
23 20
24 namespace ui { 21 namespace ui {
25 22
26 class DrmDevice; 23 class DrmDevice;
27 class DrmDeviceGenerator; 24 class DrmDeviceGenerator;
28 25
29 typedef std::vector<scoped_refptr<DrmDevice>> DrmDeviceVector; 26 typedef std::vector<scoped_refptr<DrmDevice>> DrmDeviceVector;
30 27
31 // Tracks the mapping between widgets and the DRM devices used to allocate 28 // Tracks the mapping between widgets and the DRM devices used to allocate
32 // buffers for the window represented by the widget. 29 // buffers for the window represented by the widget.
33 // Note: All calls are protected by a lock since
34 // GetDrmDevice(gfx::AcceleratedWidget) may be called on the IO thread.
35 class OZONE_EXPORT DrmDeviceManager { 30 class OZONE_EXPORT DrmDeviceManager {
36 public: 31 public:
37 DrmDeviceManager(scoped_ptr<DrmDeviceGenerator> drm_device_generator); 32 DrmDeviceManager(scoped_ptr<DrmDeviceGenerator> drm_device_generator);
38 ~DrmDeviceManager(); 33 ~DrmDeviceManager();
39 34
40 // The first device registered is assumed to be the primary device. 35 // The first device registered is assumed to be the primary device.
41 bool AddDrmDevice(const base::FilePath& path, const base::FileDescriptor& fd); 36 bool AddDrmDevice(const base::FilePath& path, const base::FileDescriptor& fd);
42 void RemoveDrmDevice(const base::FilePath& path); 37 void RemoveDrmDevice(const base::FilePath& path);
43 38
44 void InitializeIOTaskRunner(
45 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
46
47 // Updates the device associated with |widget|. 39 // Updates the device associated with |widget|.
48 void UpdateDrmDevice(gfx::AcceleratedWidget widget, 40 void UpdateDrmDevice(gfx::AcceleratedWidget widget,
49 const scoped_refptr<DrmDevice>& device); 41 const scoped_refptr<DrmDevice>& device);
50 42
51 // Removes the device associated with |widget|. 43 // Removes the device associated with |widget|.
52 void RemoveDrmDevice(gfx::AcceleratedWidget widget); 44 void RemoveDrmDevice(gfx::AcceleratedWidget widget);
53 45
54 // Returns the device associated with |widget|. If there is no association 46 // Returns the device associated with |widget|. If there is no association
55 // returns |primary_device_|. 47 // returns |primary_device_|.
56 scoped_refptr<DrmDevice> GetDrmDevice(gfx::AcceleratedWidget widget); 48 scoped_refptr<DrmDevice> GetDrmDevice(gfx::AcceleratedWidget widget);
57 49
58 const DrmDeviceVector& GetDrmDevices() const; 50 const DrmDeviceVector& GetDrmDevices() const;
59 51
60 private: 52 private:
61 // With the exception of GetDrmDevice() all functions must be called on GPU
62 // main.
63 base::ThreadChecker thread_checker_;
64
65 scoped_ptr<DrmDeviceGenerator> drm_device_generator_; 53 scoped_ptr<DrmDeviceGenerator> drm_device_generator_;
66 54
67 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
68
69 DrmDeviceVector devices_; 55 DrmDeviceVector devices_;
70 56
71 std::map<gfx::AcceleratedWidget, scoped_refptr<DrmDevice>> drm_device_map_; 57 std::map<gfx::AcceleratedWidget, scoped_refptr<DrmDevice>> drm_device_map_;
72 58
73 // This device represents the primary graphics device and is used when: 59 // This device represents the primary graphics device and is used when:
74 // 1) 'widget == kNullAcceleratedWidget' when the API requesting a buffer has 60 // 1) 'widget == kNullAcceleratedWidget' when the API requesting a buffer has
75 // no knowledge of the surface/display it belongs to (currently this happens 61 // no knowledge of the surface/display it belongs to (currently this happens
76 // for video buffers), or 62 // for video buffers), or
77 // 2) in order to allocate buffers for unmatched surfaces (surfaces without a 63 // 2) in order to allocate buffers for unmatched surfaces (surfaces without a
78 // display; ie: when in headless mode). 64 // display; ie: when in headless mode).
79 scoped_refptr<DrmDevice> primary_device_; 65 scoped_refptr<DrmDevice> primary_device_;
80 66
81 // This class is accessed from the main thread and the IO thread. This lock
82 // protects access to the device map.
83 base::Lock lock_;
84
85 DISALLOW_COPY_AND_ASSIGN(DrmDeviceManager); 67 DISALLOW_COPY_AND_ASSIGN(DrmDeviceManager);
86 }; 68 };
87 69
88 } // namespace ui 70 } // namespace ui
89 71
90 #endif // UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_MANAGER_H_ 72 #endif // UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_MANAGER_H_
OLDNEW
« 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