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

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

Issue 1104013002: Revert of ozone: Add ability to set clinet capabilities which we will need for atomic (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/test/mock_drm_device.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
index ea21a9a208f649f743f626bfe46cc0668e565756..7c7b0bfc710428cec3d2a9ebd1ff2661e57e9eee 100644
--- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
@@ -67,14 +67,6 @@
bool HardwareDisplayPlaneManager::Initialize(DrmDevice* drm) {
drm_ = drm;
-
- // Try to get all of the planes if possible, so we don't have to try to
- // discover hidden primary planes.
- bool has_universal_planes = false;
-#if defined(DRM_CLIENT_CAP_UNIVERSAL_PLANES)
- has_universal_planes = drm->SetCapability(DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
-#endif // defined(DRM_CLIENT_CAP_UNIVERSAL_PLANES)
-
ScopedDrmResourcesPtr resources(drmModeGetResources(drm->get_fd()));
if (!resources) {
PLOG(ERROR) << "Failed to get resources";
@@ -112,15 +104,13 @@
// dummy plane for which we can assign exactly one overlay.
// TODO(dnicoara): refactor this to simplify AssignOverlayPlanes and move
// this workaround into HardwareDisplayPlaneLegacy.
- if (!has_universal_planes) {
- for (int i = 0; i < resources->count_crtcs; ++i) {
- if (plane_ids.find(resources->crtcs[i] - 1) == plane_ids.end()) {
- scoped_ptr<HardwareDisplayPlane> dummy_plane(
- CreatePlane(resources->crtcs[i] - 1, (1 << i)));
- dummy_plane->set_is_dummy(true);
- if (dummy_plane->Initialize(drm))
- planes_.push_back(dummy_plane.release());
- }
+ for (int i = 0; i < resources->count_crtcs; ++i) {
+ if (plane_ids.find(resources->crtcs[i] - 1) == plane_ids.end()) {
+ scoped_ptr<HardwareDisplayPlane> dummy_plane(
+ CreatePlane(resources->crtcs[i] - 1, (1 << i)));
+ dummy_plane->set_is_dummy(true);
+ if (dummy_plane->Initialize(drm))
+ planes_.push_back(dummy_plane.release());
}
}
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_device.cc ('k') | ui/ozone/platform/drm/test/mock_drm_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698