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

Side by Side Diff: ui/ozone/platform/drm/host/drm_device_handle.cc

Issue 1125283012: [Ozone-Drm] Revert of holding on to the DRM FDs in the browser process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 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 #include "ui/ozone/platform/drm/host/drm_device_handle.h" 5 #include "ui/ozone/platform/drm/host/drm_device_handle.h"
6 6
7 #include <fcntl.h> 7 #include <fcntl.h>
8 #include <xf86drm.h> 8 #include <xf86drm.h>
9 #include <xf86drmMode.h> 9 #include <xf86drmMode.h>
10 10
(...skipping 12 matching lines...) Expand all
23 // authentication logic to figure out if the device has enough permissions. 23 // authentication logic to figure out if the device has enough permissions.
24 return !drmGetMagic(fd, &magic) && !drmAuthMagic(fd, magic); 24 return !drmGetMagic(fd, &magic) && !drmAuthMagic(fd, magic);
25 } 25 }
26 26
27 } // namespace 27 } // namespace
28 28
29 DrmDeviceHandle::DrmDeviceHandle() { 29 DrmDeviceHandle::DrmDeviceHandle() {
30 } 30 }
31 31
32 DrmDeviceHandle::~DrmDeviceHandle() { 32 DrmDeviceHandle::~DrmDeviceHandle() {
33 base::ThreadRestrictions::AssertIOAllowed(); 33 if (file_.is_valid())
34 base::ThreadRestrictions::AssertIOAllowed();
34 } 35 }
35 36
36 bool DrmDeviceHandle::Initialize(const base::FilePath& path) { 37 bool DrmDeviceHandle::Initialize(const base::FilePath& path) {
37 CHECK(path.DirName() == base::FilePath("/dev/dri")); 38 CHECK(path.DirName() == base::FilePath("/dev/dri"));
38 base::ThreadRestrictions::AssertIOAllowed(); 39 base::ThreadRestrictions::AssertIOAllowed();
39 bool print_warning = true; 40 bool print_warning = true;
40 while (true) { 41 while (true) {
41 file_.reset(); 42 file_.reset();
42 int fd = HANDLE_EINTR(open(path.value().c_str(), O_RDWR | O_CLOEXEC)); 43 int fd = HANDLE_EINTR(open(path.value().c_str(), O_RDWR | O_CLOEXEC));
43 if (fd < 0) { 44 if (fd < 0) {
(...skipping 12 matching lines...) Expand all
56 } 57 }
57 58
58 VLOG(1) << "Succeeded authenticating " << path.value(); 59 VLOG(1) << "Succeeded authenticating " << path.value();
59 return true; 60 return true;
60 } 61 }
61 62
62 bool DrmDeviceHandle::IsValid() const { 63 bool DrmDeviceHandle::IsValid() const {
63 return file_.is_valid(); 64 return file_.is_valid();
64 } 65 }
65 66
66 base::ScopedFD DrmDeviceHandle::Duplicate() { 67 base::ScopedFD DrmDeviceHandle::PassFD() {
67 DCHECK(file_.is_valid()); 68 return file_.Pass();
68 int fd = dup(file_.get());
69 if (fd < 0) {
70 PLOG(ERROR) << "Failed to dup";
71 return base::ScopedFD();
72 }
73
74 return base::ScopedFD(fd);
75 } 69 }
76 70
77 } // namespace ui 71 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/drm/host/drm_device_handle.h ('k') | ui/ozone/platform/drm/host/drm_display_host_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698