commit 9170b3105e9c6decd3e15a693584f410a0188234
author Roman Kovalivskyi <roman.kovalivskyi@globallogic.com> Mon Feb 03 18:13:57 2020 +0200
committer Roman Kovalivskyi <roman.kovalivskyi@globallogic.com> Wed Feb 19 17:13:43 2020 +0200
tree 87e2f61bcd726d64fc504217cf78445c4c920d63
parent 8fae156cf9127c61fc3ba998e71de85b737ac3e8

drm_hwcomposer: Add statistics on flattening to dump message

We need some way to verify that current composition is not failed to
compose, but instead sent to flatten on GPU.

Dump message shows current flattening state. It also displays how
often do compositor switches into flattening.

Signed-off-by: Roman Kovalivskyi <roman.kovalivskyi@globallogic.com>

compositor/drmdisplaycompositor.cpp

diff --git a/compositor/drmdisplaycompositor.cpp b/compositor/drmdisplaycompositor.cpp
index 401af48..1519736 100644
--- a/compositor/drmdisplaycompositor.cpp
+++ b/compositor/drmdisplaycompositor.cpp
@@ -23,6 +23,7 @@
 #include <sched.h>
 #include <stdlib.h>
 #include <time.h>
+#include <array>
 #include <sstream>
 #include <vector>
 
@@ -40,6 +41,15 @@
 
 namespace android {
 
+std::ostream &operator<<(std::ostream &str, FlatteningState state) {
+  std::array<const char *, 6> flattenting_state_str = {
+      "None",   "Not needed", "SF Requested", "Squashed by GPU",
+      "Serial", "Concurrent",
+  };
+
+  return str << flattenting_state_str[static_cast<int>(state)];
+}
+
 class CompositorVsyncCallback : public VsyncCallback {
  public:
   CompositorVsyncCallback(DrmDisplayCompositor *compositor)
@@ -64,7 +74,8 @@
       dump_last_timestamp_ns_(0),
       flatten_countdown_(FLATTEN_COUNTDOWN_INIT),
       writeback_fence_(-1),
-      flattening_state_(FlatteningState::kNone) {
+      flattening_state_(FlatteningState::kNone),
+      frames_flattened_(0) {
   struct timespec ts;
   if (clock_gettime(CLOCK_MONOTONIC, &ts))
     return;
@@ -148,6 +159,10 @@
   return flattening_state_;
 }
 
+uint32_t DrmDisplayCompositor::GetFlattenedFramesCount() const {
+  return frames_flattened_;
+}
+
 bool DrmDisplayCompositor::ShouldFlattenOnClient() const {
   return flattening_state_ == FlatteningState::kClientRequested ||
          flattening_state_ == FlatteningState::kClientDone;
@@ -616,9 +631,9 @@
 
   flatten_countdown_ = FLATTEN_COUNTDOWN_INIT;
   if (flattening_state_ != FlatteningState::kClientRequested) {
-    flattening_state_ = FlatteningState::kNone;
+    SetFlattening(FlatteningState::kNone);
   } else {
-    flattening_state_ = FlatteningState::kClientDone;
+    SetFlattening(FlatteningState::kClientDone);
   }
   vsync_worker_.VSyncControl(!writeback);
 }
@@ -776,6 +791,23 @@
   return 0;
 }
 
+void DrmDisplayCompositor::SetFlattening(FlatteningState new_state) {
+  if (flattening_state_ != new_state) {
+    switch (flattening_state_) {
+      case FlatteningState::kClientDone:
+      case FlatteningState::kConcurrent:
+      case FlatteningState::kSerial:
+        ++frames_flattened_;
+        break;
+      case FlatteningState::kClientRequested:
+      case FlatteningState::kNone:
+      case FlatteningState::kNotNeeded:
+        break;
+    }
+  }
+  flattening_state_ = new_state;
+}
+
 bool DrmDisplayCompositor::IsFlatteningNeeded() const {
   return CountdownExpired() && active_composition_->layers().size() >= 2;
 }
@@ -787,7 +819,7 @@
       if (!IsFlatteningNeeded()) {
         if (flattening_state_ != FlatteningState::kClientDone) {
           ALOGV("Flattening is not needed");
-          flattening_state_ = FlatteningState::kNotNeeded;
+          SetFlattening(FlatteningState::kNotNeeded);
         }
         return -EALREADY;
       }
@@ -796,7 +828,7 @@
     ALOGV(
         "No writeback connector available, "
         "falling back to client composition");
-    flattening_state_ = FlatteningState::kClientRequested;
+    SetFlattening(FlatteningState::kClientRequested);
     refresh_display_cb_(display_);
     return 0;
   } else {
@@ -822,7 +854,7 @@
     return ret;
   if (!IsFlatteningNeeded()) {
     ALOGV("Flattening is not needed");
-    flattening_state_ = FlatteningState::kNotNeeded;
+    SetFlattening(FlatteningState::kNotNeeded);
     return -EALREADY;
   }
 
@@ -931,7 +963,7 @@
     return ret;
   if (!IsFlatteningNeeded()) {
     ALOGV("Flattening is not needed");
-    flattening_state_ = FlatteningState::kNotNeeded;
+    SetFlattening(FlatteningState::kNotNeeded);
     return -EALREADY;
   }
   DrmCrtc *crtc = active_composition_->crtc();
@@ -1007,10 +1039,10 @@
   }
 
   if (writeback_conn->display() != display_) {
-    flattening_state_ = FlatteningState::kConcurrent;
+    SetFlattening(FlatteningState::kConcurrent);
     return FlattenConcurrent(writeback_conn);
   } else {
-    flattening_state_ = FlatteningState::kSerial;
+    SetFlattening(FlatteningState::kSerial);
     return FlattenSerial(writeback_conn);
   }