Revert of ozone: Add ability to set clinet capabilities which we will need for atomic (patchset #2 id:20001 of https://codereview.chromium.org/1100803004/)

Reason for revert:
Speculative revert - Linux ChromiumOS Ozone Tests is broken.
http://goo.gl/vykWsG

Original issue's description:
> ozone: Add ability to set client capabilities which we will need for atomic
>
> Committed: https://crrev.com/e5983b7fde9d576bd514490106564e2238eb0713
> Cr-Commit-Position: refs/heads/master@{#326860}

TBR=dnicoara@chromium.org,achaulk@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1104013002

Cr-Commit-Position: refs/heads/master@{#327018}

5 files changed, 7 insertions, 29 deletions

diff --git a/ui/ozone/platform/drm/gpu/drm_device.cc b/ui/ozone/platform/drm/gpu/drm_device.cc
index 9bbac40..7b03b43 100644
--- a/ui/ozone/platform/drm/gpu/drm_device.cc
+++ b/ui/ozone/platform/drm/gpu/drm_device.cc
@@ -514,11 +514,6 @@ bool DrmDevice::CommitProperties(drmModePropertySet* properties,
 #endif  // defined(USE_DRM_ATOMIC)
 }
 
-bool DrmDevice::SetCapability(uint64_t capability, uint64_t value) {
-  DCHECK(file_.IsValid());
-  return !drmSetClientCap(file_.GetPlatformFile(), capability, value);
-}
-
 bool DrmDevice::SetMaster() {
   DCHECK(file_.IsValid());
   return (drmSetMaster(file_.GetPlatformFile()) == 0);
diff --git a/ui/ozone/platform/drm/gpu/drm_device.h b/ui/ozone/platform/drm/gpu/drm_device.h
index 0e74f52f..6fc2e49 100644
--- a/ui/ozone/platform/drm/gpu/drm_device.h
+++ b/ui/ozone/platform/drm/gpu/drm_device.h
@@ -160,8 +160,6 @@ class OZONE_EXPORT DrmDevice : public base::RefCountedThreadSafe<DrmDevice> {
                                 uint32_t flags,
                                 const PageFlipCallback& callback);
 
-  virtual bool SetCapability(uint64_t capability, uint64_t value);
-
   // Drm master related
   virtual bool SetMaster();
   virtual bool DropMaster();
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 ea21a9a..7c7b0bf 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 @@ HardwareDisplayPlaneManager::~HardwareDisplayPlaneManager() {
 
 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 @@ bool HardwareDisplayPlaneManager::Initialize(DrmDevice* drm) {
   // 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());
     }
   }
 
diff --git a/ui/ozone/platform/drm/test/mock_drm_device.cc b/ui/ozone/platform/drm/test/mock_drm_device.cc
index 9415ac5..3a822dc 100644
--- a/ui/ozone/platform/drm/test/mock_drm_device.cc
+++ b/ui/ozone/platform/drm/test/mock_drm_device.cc
@@ -240,10 +240,6 @@ bool MockDrmDevice::CommitProperties(drmModePropertySet* properties,
   return false;
 }
 
-bool MockDrmDevice::SetCapability(uint64_t capability, uint64_t value) {
-  return false;
-}
-
 void MockDrmDevice::RunCallbacks() {
   while (!callbacks_.empty()) {
     PageFlipCallback callback = callbacks_.front();
diff --git a/ui/ozone/platform/drm/test/mock_drm_device.h b/ui/ozone/platform/drm/test/mock_drm_device.h
index cd1c58b..5632b6e 100644
--- a/ui/ozone/platform/drm/test/mock_drm_device.h
+++ b/ui/ozone/platform/drm/test/mock_drm_device.h
@@ -108,7 +108,6 @@ class MockDrmDevice : public ui::DrmDevice {
   bool CommitProperties(drmModePropertySet* properties,
                         uint32_t flags,
                         const PageFlipCallback& callback) override;
-  bool SetCapability(uint64_t capability, uint64_t value) override;
 
  private:
   ~MockDrmDevice() override;