commit dccc6fb4f364df3a74bdd02c537892eb1a8ac11d
author Roman Stratiienko <roman.o.stratiienko@globallogic.com> Sat Oct 23 17:35:44 2021 +0300
committer Roman Stratiienko <roman.o.stratiienko@globallogic.com> Thu Oct 28 21:43:01 2021 +0300
tree 99807c9b31009f1f9235c2d270ef02176adbb98e
parent 40b374b1400d668c9975c5c3d239d54c84429dc6

drm_hwcomposer: Make single atomic function for all atomic commit ops.

... to allow precise control on atomic commit operations.

This should also help to implement dynamic modechange, readback and
other useful features.

Signed-off-by: Roman Stratiienko <roman.o.stratiienko@globallogic.com>

DrmHwcTwo.cpp

diff --git a/DrmHwcTwo.cpp b/DrmHwcTwo.cpp
index 071f3bf..dada168 100644
--- a/DrmHwcTwo.cpp
+++ b/DrmHwcTwo.cpp
@@ -253,7 +253,8 @@
 }
 
 void DrmHwcTwo::HwcDisplay::ClearDisplay() {
-  compositor_.ClearDisplay();
+  AtomicCommitArgs a_args = {.clear_active_composition = true};
+  compositor_.ExecuteAtomicCommit(a_args);
 }
 
 HWC2::Error DrmHwcTwo::HwcDisplay::Init(std::vector<DrmPlane *> *planes) {
@@ -711,7 +712,7 @@
     composition_layers.emplace_back(std::move(layer));
   }
 
-  auto composition = std::make_unique<DrmDisplayComposition>(crtc_,
+  auto composition = std::make_shared<DrmDisplayComposition>(crtc_,
                                                              planner_.get());
 
   // TODO(nobody): Don't always assume geometry changed
@@ -740,16 +741,21 @@
     i = overlay_planes.erase(i);
   }
 
-  if (test) {
-    ret = compositor_.TestComposition(composition.get());
-  } else {
-    ret = compositor_.ApplyComposition(std::move(composition));
-    AddFenceToPresentFence(compositor_.TakeOutFence());
-  }
+  AtomicCommitArgs a_args = {
+      .test_only = test,
+      .composition = composition,
+  };
+
+  ret = compositor_.ExecuteAtomicCommit(a_args);
+
   if (ret) {
     if (!test)
       ALOGE("Failed to apply the frame composition ret=%d", ret);
     return HWC2::Error::BadParameter;
+  } else {
+    if (!test) {
+      AddFenceToPresentFence(std::move(a_args.out_fence));
+    }
   }
   return HWC2::Error::None;
 }
@@ -793,11 +799,12 @@
     return HWC2::Error::BadConfig;
   }
 
-  if (!compositor_.SetDisplayMode(*mode)) {
-    return HWC2::Error::BadConfig;
-  }
-  int err = compositor_.ApplyComposition(
-      compositor_.CreateInitializedComposition());
+  AtomicCommitArgs a_args = {
+      .display_mode = *mode,
+      .clear_active_composition = true,
+  };
+
+  int err = compositor_.ExecuteAtomicCommit(a_args);
   if (err != 0) {
     ALOGE("Failed to queue mode changing commit %d", err);
     return HWC2::Error::BadConfig;
@@ -882,12 +889,14 @@
 HWC2::Error DrmHwcTwo::HwcDisplay::SetPowerMode(int32_t mode_in) {
   supported(__func__);
   auto mode = static_cast<HWC2::PowerMode>(mode_in);
+  AtomicCommitArgs a_args{};
+
   switch (mode) {
     case HWC2::PowerMode::Off:
-      compositor_.SetDisplayActive(false);
+      a_args.active = false;
       break;
     case HWC2::PowerMode::On:
-      compositor_.SetDisplayActive(true);
+      a_args.active = true;
       break;
     case HWC2::PowerMode::Doze:
     case HWC2::PowerMode::DozeSuspend:
@@ -897,10 +906,9 @@
       return HWC2::Error::BadParameter;
   };
 
-  int ret = compositor_.ApplyComposition(
-      compositor_.CreateInitializedComposition());
-  if (ret) {
-    ALOGE("Failed to apply the dpms composition ret=%d", ret);
+  int err = compositor_.ExecuteAtomicCommit(a_args);
+  if (err) {
+    ALOGE("Failed to apply the dpms composition err=%d", err);
     return HWC2::Error::BadParameter;
   }
   return HWC2::Error::None;