drm_hwcomposer: Move MarkValidated into Backend

The MarkValidated function is used only for display validation which is
implemented in the generic backend.

Signed-off-by: Matvii Zorin <matvii.zorin@globallogic.com>

diff --git a/DrmHwcTwo.cpp b/DrmHwcTwo.cpp
index 0647cf1..90d39f0 100644 (file)
--- a/DrmHwcTwo.cpp
+++ b/DrmHwcTwo.cpp
@@ -865,17 +865,6 @@ HWC2::Error DrmHwcTwo::HwcDisplay::SetVsyncEnabled(int32_t enabled) {
   return HWC2::Error::None;
 }
 
-void DrmHwcTwo::HwcDisplay::MarkValidated(
-    std::map<uint32_t, DrmHwcTwo::HwcLayer *> &z_map, size_t client_first_z,
-    size_t client_size) {
-  for (std::pair<const uint32_t, DrmHwcTwo::HwcLayer *> &l : z_map) {
-    if (l.first >= client_first_z && l.first < client_first_z + client_size)
-      l.second->set_validated_type(HWC2::Composition::Client);
-    else
-      l.second->set_validated_type(HWC2::Composition::Device);
-  }
-}
-
 HWC2::Error DrmHwcTwo::HwcDisplay::ValidateDisplay(uint32_t *num_types,
                                                    uint32_t *num_requests) {
   supported(__func__);

diff --git a/DrmHwcTwo.h b/DrmHwcTwo.h
index 1a16dce..251c765 100644 (file)
--- a/DrmHwcTwo.h
+++ b/DrmHwcTwo.h
@@ -175,8 +175,6 @@ class DrmHwcTwo : public hwc2_device_t {
                                  hwc2_function_pointer_t func);
     HWC2::Error CreateComposition(bool test);
     bool HardwareSupportsLayerType(HWC2::Composition comp_type);
-    void MarkValidated(std::map<uint32_t, DrmHwcTwo::HwcLayer *> &z_map,
-                       size_t client_first_z, size_t client_size);
 
     void ClearDisplay();
 

diff --git a/backend/Backend.cpp b/backend/Backend.cpp
index 196a893..c7e78c9 100644 (file)
--- a/backend/Backend.cpp
+++ b/backend/Backend.cpp
@@ -46,11 +46,11 @@ HWC2::Error Backend::ValidateDisplay(DrmHwcTwo::HwcDisplay *display,
   if (display->compositor().ShouldFlattenOnClient()) {
     client_start = 0;
     client_size = z_map.size();
-    display->MarkValidated(z_map, client_start, client_size);
+    MarkValidated(z_map, client_start, client_size);
   } else {
     std::tie(client_start, client_size) = GetClientLayers(display, z_map);
 
-    display->MarkValidated(z_map, client_start, client_size);
+    MarkValidated(z_map, client_start, client_size);
 
     bool testing_needed = !(client_start == 0 && client_size == z_map.size());
 
@@ -59,7 +59,7 @@ HWC2::Error Backend::ValidateDisplay(DrmHwcTwo::HwcDisplay *display,
       ++display->total_stats().failed_kms_validate_;
       client_start = 0;
       client_size = z_map.size();
-      display->MarkValidated(z_map, 0, client_size);
+      MarkValidated(z_map, 0, client_size);
     }
   }
 
@@ -112,6 +112,16 @@ uint32_t Backend::CalcPixOps(const std::vector<DrmHwcTwo::HwcLayer *> &layers,
   return pixops;
 }
 
+void Backend::MarkValidated(std::map<uint32_t, DrmHwcTwo::HwcLayer *> &z_map,
+                            size_t client_first_z, size_t client_size) {
+  for (std::pair<const uint32_t, DrmHwcTwo::HwcLayer *> &l : z_map) {
+    if (l.first >= client_first_z && l.first < client_first_z + client_size)
+      l.second->set_validated_type(HWC2::Composition::Client);
+    else
+      l.second->set_validated_type(HWC2::Composition::Device);
+  }
+}
+
 std::tuple<int, int> Backend::GetExtraClientRange(
     DrmHwcTwo::HwcDisplay *display,
     const std::vector<DrmHwcTwo::HwcLayer *> &layers, int client_start,

diff --git a/backend/Backend.h b/backend/Backend.h
index a32c57f..821994f 100644 (file)
--- a/backend/Backend.h
+++ b/backend/Backend.h
@@ -36,6 +36,8 @@ class Backend {
  protected:
   uint32_t CalcPixOps(const std::map<uint32_t, DrmHwcTwo::HwcLayer *> &z_map,
                       size_t first_z, size_t size);
+  void MarkValidated(std::map<uint32_t, DrmHwcTwo::HwcLayer *> &z_map,
+                     size_t client_first_z, size_t client_size);
   std::tuple<int, int> GetExtraClientRange(
       DrmHwcTwo::HwcDisplay *display,
       const std::vector<DrmHwcTwo::HwcLayer *> &layers, int client_start,