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

Unified Diff: ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc

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
Index: ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc
diff --git a/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc b/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc
index 5cee091d8ca4051f020f6b56dbfb163a4027bdaf..724cd705215e86e2ed1183c8591af41cb62299d5 100644
--- a/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc
+++ b/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc
@@ -69,7 +69,7 @@ std::vector<DisplaySnapshot_Params> DrmGpuDisplayManager::GetDisplays() {
ScopedVector<DrmDisplay> old_displays(displays_.Pass());
std::vector<DisplaySnapshot_Params> params_list;
- const DrmDeviceVector& devices = drm_device_manager_->GetDrmDevices();
+ DrmDeviceVector devices = drm_device_manager_->GetDrmDevices();
// Unique identifier used to create the display id.
size_t index = 0;
for (const auto& drm : devices) {
@@ -96,7 +96,7 @@ std::vector<DisplaySnapshot_Params> DrmGpuDisplayManager::GetDisplays() {
}
bool DrmGpuDisplayManager::TakeDisplayControl() {
- const DrmDeviceVector& devices = drm_device_manager_->GetDrmDevices();
+ DrmDeviceVector devices = drm_device_manager_->GetDrmDevices();
for (const auto& drm : devices) {
if (!drm->SetMaster()) {
LOG(ERROR) << "Failed to take control of the display";
@@ -108,7 +108,7 @@ bool DrmGpuDisplayManager::TakeDisplayControl() {
}
bool DrmGpuDisplayManager::RelinquishDisplayControl() {
- const DrmDeviceVector& devices = drm_device_manager_->GetDrmDevices();
+ DrmDeviceVector devices = drm_device_manager_->GetDrmDevices();
for (const auto& drm : devices) {
if (!drm->DropMaster()) {
LOG(ERROR) << "Failed to relinquish control of the display";
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_device_manager.cc ('k') | ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698