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

ui/ozone/platform/dri/hardware_display_plane_manager_unittest.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 <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/ozone/platform/dri/crtc_controller.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
 #include "ui/ozone/platform/dri/hardware_display_plane.h"
 #include "ui/ozone/platform/dri/hardware_display_plane_manager.h"
+#include "ui/ozone/platform/dri/hardware_display_plane_manager_legacy.h"
 #include "ui/ozone/platform/dri/overlay_plane.h"
 #include "ui/ozone/platform/dri/scanout_buffer.h"
+#include "ui/ozone/platform/dri/test/mock_dri_wrapper.h"
 
 namespace {
 
 struct FakePlaneInfo {
   uint32_t id;
   uint32_t allowed_crtc_mask;
 };
 
 const FakePlaneInfo kOnePlanePerCrtc[] = {{10, 1}, {20, 2}};
 const FakePlaneInfo kTwoPlanesPerCrtc[] = {{10, 1}, {11, 1}, {20, 2}, {21, 2}};
 const FakePlaneInfo kOnePlanePerCrtcWithShared[] = {{10, 1}, {20, 2}, {50, 3}};
 
 class FakeScanoutBuffer : public ui::ScanoutBuffer {
  public:
   FakeScanoutBuffer() {}
 
   // ui::ScanoutBuffer:
-  uint32_t GetFramebufferId() const override { return 0; }
+  uint32_t GetFramebufferId() const override { return 1; }
   uint32_t GetHandle() const override { return 0; }
   gfx::Size GetSize() const override { return gfx::Size(1, 1); }
 
  protected:
   ~FakeScanoutBuffer() override {}
 };
 
 class FakePlaneManager : public ui::HardwareDisplayPlaneManager {
  public:
   FakePlaneManager() : plane_count_(0) {}
@@ skipping 135 matching lines @@
 TEST_F(HardwareDisplayPlaneManagerTest, MultipleFrames) {
   ui::OverlayPlaneList assigns;
   assigns.push_back(ui::OverlayPlane(fake_buffer_));
   plane_manager_->InitForTest(kTwoPlanesPerCrtc, arraysize(kTwoPlanesPerCrtc),
                               default_crtcs_);
 
   EXPECT_TRUE(plane_manager_->AssignOverlayPlanes(&state_, assigns,
                                                   default_crtcs_[0], nullptr));
   EXPECT_EQ(1, plane_manager_->plane_count());
   // Pretend we committed the frame.
+  state_.committed = true;
   state_.plane_list.swap(state_.old_plane_list);
   ui::HardwareDisplayPlane* old_plane = state_.old_plane_list[0];
   // The same plane should be used.
   EXPECT_TRUE(plane_manager_->AssignOverlayPlanes(&state_, assigns,
                                                   default_crtcs_[0], nullptr));
   EXPECT_EQ(2, plane_manager_->plane_count());
   EXPECT_EQ(state_.plane_list[0], old_plane);
 }
 
 TEST_F(HardwareDisplayPlaneManagerTest, MultipleFramesDifferentPlanes) {
@@ skipping 21 matching lines @@
                               default_crtcs_);
 
   EXPECT_TRUE(plane_manager_->AssignOverlayPlanes(&state_, assigns,
                                                   default_crtcs_[1], nullptr));
   EXPECT_EQ(2, plane_manager_->plane_count());
   // The shared plane is now unavailable for use by the other CRTC.
   EXPECT_FALSE(plane_manager_->AssignOverlayPlanes(&state_, assigns,
                                                    default_crtcs_[0], nullptr));
 }
 
+TEST(HardwareDisplayPlaneManagerLegacyTest, UnusedPlanesAreReleased) {
+  std::vector<uint32_t> crtcs;
+  crtcs.push_back(100);
+  ui::MockDriWrapper drm(3, false, crtcs, 2);
+  ui::OverlayPlaneList assigns;
+  scoped_refptr<FakeScanoutBuffer> fake_buffer = new FakeScanoutBuffer();
+  assigns.push_back(ui::OverlayPlane(fake_buffer));
+  assigns.push_back(ui::OverlayPlane(fake_buffer));
+  ui::HardwareDisplayPlaneList hdpl;
+  ui::CrtcController crtc(&drm, crtcs[0], 0);
+  EXPECT_TRUE(drm.plane_manager()->AssignOverlayPlanes(&hdpl, assigns, crtcs[0],
+                                                       &crtc));
+  EXPECT_TRUE(drm.plane_manager()->Commit(&hdpl));
+  assigns.clear();
+  assigns.push_back(ui::OverlayPlane(fake_buffer));
+  EXPECT_TRUE(drm.plane_manager()->AssignOverlayPlanes(&hdpl, assigns, crtcs[0],
+                                                       &crtc));
+  EXPECT_EQ(0, drm.get_overlay_clear_call_count());
+  EXPECT_TRUE(drm.plane_manager()->Commit(&hdpl));
+  EXPECT_EQ(1, drm.get_overlay_clear_call_count());
+}
+
 }  // namespace