[Ozone-Drm] Pick pending buffer over current buffer when modesetting

ui/ozone/platform/drm/gpu/hardware_display_controller.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/drm/gpu/hardware_display_controller.h"
 
 #include <drm.h>
 #include <string.h>
 #include <xf86drm.h>
 
@@ skipping 38 matching lines @@
   TRACE_EVENT0("drm", "HDC::Modeset");
   DCHECK(primary.buffer.get());
   bool status = true;
   for (size_t i = 0; i < crtc_controllers_.size(); ++i)
     status &= crtc_controllers_[i]->Modeset(primary, mode);
 
   is_disabled_ = false;
   mode_ = mode;
 
   current_planes_ = std::vector<OverlayPlane>(1, primary);
-  pending_planes_.clear();
   ClearPendingRequests();
 
   // Because a page flip is pending we need to leave some state for the
   // callback. We use the modeset state since it is the only valid state.
   if (HasPendingPageFlips())
     requests_.push_back(
         PageFlipRequest(current_planes_, false, base::Bind(&base::DoNothing)));
 
   return status;
 }
 
 bool HardwareDisplayController::Enable() {
   TRACE_EVENT0("drm", "HDC::Enable");
   DCHECK(!current_planes_.empty());
-  const OverlayPlane* primary = OverlayPlane::GetPrimaryPlane(current_planes_);
+
+  const OverlayPlane* primary = nullptr;
+  // Use the last scheduled buffer to modeset to preserve request order.
+  if (!requests_.empty())
+    primary = OverlayPlane::GetPrimaryPlane(requests_.back().planes);
+  else
+    primary = OverlayPlane::GetPrimaryPlane(current_planes_);
 
   return Modeset(*primary, mode_);
 }
 
 void HardwareDisplayController::Disable() {
   TRACE_EVENT0("drm", "HDC::Disable");
   for (size_t i = 0; i < crtc_controllers_.size(); ++i)
     crtc_controllers_[i]->Disable();
 
   is_disabled_ = true;
@@ skipping 233 matching lines @@
 
 void HardwareDisplayController::ClearPendingRequests() {
   while (!requests_.empty()) {
     PageFlipRequest request = requests_.front();
     requests_.pop_front();
     request.callback.Run();
   }
 }
 
 }  // namespace ui