ozone: fix HDPMLegacy - do the PF after overlays, also clear old overlays

ui/ozone/platform/dri/hardware_display_plane_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/ozone/platform/dri/hardware_display_plane_manager.h"
 
 #include <drm.h>
 #include <errno.h>
 #include <xf86drm.h>
 
 #include "base/logging.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/ozone/platform/dri/crtc_controller.h"
 #include "ui/ozone/platform/dri/dri_wrapper.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
 #include "ui/ozone/platform/dri/scanout_buffer.h"
 #include "ui/ozone/public/ozone_switches.h"
 
 namespace ui {
 namespace {
 
 const float kFixedPointScaleValue = 65536.0f;
 
 }  // namespace
 
-HardwareDisplayPlaneList::HardwareDisplayPlaneList() {
+HardwareDisplayPlaneList::HardwareDisplayPlaneList() : committed(false) {
 }
 HardwareDisplayPlaneList::~HardwareDisplayPlaneList() {
   for (auto* plane : plane_list) {
     plane->set_in_use(false);
     plane->set_owning_crtc(0);
   }
   for (auto* plane : old_plane_list) {
     plane->set_in_use(false);
     plane->set_owning_crtc(0);
   }
@@ skipping 107 matching lines @@
     if (crtcs_[i] == crtc_id)
       return i;
   return -1;
 }
 
 bool HardwareDisplayPlaneManager::AssignOverlayPlanes(
     HardwareDisplayPlaneList* plane_list,
     const OverlayPlaneList& overlay_list,
     uint32_t crtc_id,
     CrtcController* crtc) {
-  for (auto* plane : plane_list->old_plane_list) {
-    plane->set_in_use(false);
+  // If we had previously committed this set, mark all owned planes as free.
+  if (plane_list->committed) {
+    plane_list->committed = false;
+    for (auto* plane : plane_list->old_plane_list) {
+      plane->set_in_use(false);
+    }
   }
-  plane_list->old_plane_list.clear();
 
   int crtc_index = LookupCrtcIndex(crtc_id);
   if (crtc_index < 0) {
     LOG(ERROR) << "Cannot find crtc " << crtc_id;
     return false;
   }
 
   size_t plane_idx = 0;
   for (const auto& plane : overlay_list) {
     HardwareDisplayPlane* hw_plane =
@@ skipping 34 matching lines @@
     if (plane->owning_crtc() == crtc_id) {
       plane->set_owning_crtc(0);
       plane->set_in_use(false);
     } else {
       plane_list->old_plane_list.push_back(plane);
     }
   }
 }
 
 }  // namespace ui