Atomic: Don’t keep track of Cursor planes

ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc

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 4bf1c84d631e26a953a3db3275ff44c8e9cb2214..04ef2af646b69c17ecd086c4d59e568a0277a2d0 100644
--- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
@@ -107,8 +107,12 @@ bool HardwareDisplayPlaneManager::Initialize(DrmDevice* drm) {
     for (uint32_t j = 0; j < formats_size; j++)
       supported_formats.push_back(drm_plane->formats[j]);
 
-    if (plane->Initialize(drm, supported_formats)) {
-      planes_.push_back(plane.Pass());
+    if (plane->Initialize(drm, supported_formats, false)) {
+      // CRTC controllers always assume they have a cursor plane and the cursor
+      // plane is updated via cursor specific DRM API. Hence, we dont keep
+      // track of Cursor plane here to avoid re-using it for any other purpose.
+      if (plane->type() != HardwareDisplayPlane::kCursor)
+        planes_.push_back(plane.Pass());
     }
   }
 
@@ -121,8 +125,7 @@ bool HardwareDisplayPlaneManager::Initialize(DrmDevice* drm) {
       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, std::vector<uint32_t>())) {
+        if (dummy_plane->Initialize(drm, std::vector<uint32_t>(), true)) {
           planes_.push_back(dummy_plane.Pass());
         }
       }
@@ -193,7 +196,7 @@ bool HardwareDisplayPlaneManager::AssignOverlayPlanes(
     }
 
     gfx::Rect fixed_point_rect;
-    if (!hw_plane->is_dummy()) {
+    if (hw_plane->type() != HardwareDisplayPlane::kDummy) {
       const gfx::Size& size = plane.buffer->GetSize();
       gfx::RectF crop_rect = plane.crop_rect;
       crop_rect.Scale(size.width(), size.height());