commit fc014f5792053a3a5712d1f6f65d55994dce24f4
author Roman Stratiienko <roman.o.stratiienko@globallogic.com> Thu Dec 23 19:04:29 2021 +0200
committer Roman Stratiienko <roman.o.stratiienko@globallogic.com> Wed Jan 12 10:33:55 2022 +0200
tree 0cf2a0f3e247bcf9aa5ad0ab1f711e916df542d2
parent e78235c0be19778ff25839ab8bedc0d06fc8b7ad

drm_hwcomposer: CI: Set clang-tidy level to NORMAL for some files

Some of files require small adjustments to move into NORMAL checks list.

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

compositor/DrmDisplayComposition.cpp

diff --git a/compositor/DrmDisplayComposition.cpp b/compositor/DrmDisplayComposition.cpp
index a1c0e69..41589c5 100644
--- a/compositor/DrmDisplayComposition.cpp
+++ b/compositor/DrmDisplayComposition.cpp
@@ -74,7 +74,7 @@
       continue;
 
     std::vector<DrmPlane *> *container = nullptr;
-    if (i.plane()->type() == DRM_PLANE_TYPE_PRIMARY)
+    if (i.plane()->GetType() == DRM_PLANE_TYPE_PRIMARY)
       container = primary_planes;
     else
       container = overlay_planes;

compositor/DrmDisplayCompositor.cpp

diff --git a/compositor/DrmDisplayCompositor.cpp b/compositor/DrmDisplayCompositor.cpp
index 6b8a92b..a26f2df 100644
--- a/compositor/DrmDisplayCompositor.cpp
+++ b/compositor/DrmDisplayCompositor.cpp
@@ -161,7 +161,7 @@
       }
       DrmHwcLayer &layer = layers[source_layer];
 
-      new_frame_state.used_framebuffers.emplace_back(layer.FbIdHandle);
+      new_frame_state.used_framebuffers.emplace_back(layer.fb_id_handle);
       new_frame_state.used_planes.emplace_back(plane);
 
       /* Remove from 'unused' list, since plane is re-used */

compositor/Planner.cpp

diff --git a/compositor/Planner.cpp b/compositor/Planner.cpp
index 6c0785a..2d24499 100644
--- a/compositor/Planner.cpp
+++ b/compositor/Planner.cpp
@@ -57,7 +57,7 @@
 
   // Go through the provisioning stages and provision planes
   int ret = ProvisionPlanesInternal(&composition, layers, &planes);
-  if (ret) {
+  if (ret != 0) {
     ALOGV("Failed provision stage with ret %d", ret);
     return std::make_tuple(ret, std::vector<DrmCompositionPlane>());
   }
@@ -75,7 +75,7 @@
     if (ret == -ENOENT)
       break;
 
-    if (ret) {
+    if (ret != 0) {
       ALOGV("Failed to emplace layer %zu, dropping it", i->first);
       return ret;
     }

compositor/Planner.h

diff --git a/compositor/Planner.h b/compositor/Planner.h
index c148b6e..af75954 100644
--- a/compositor/Planner.h
+++ b/compositor/Planner.h
@@ -49,16 +49,16 @@
     DrmPlane *plane = PopPlane(planes);
     std::vector<DrmPlane *> unused_planes;
     int ret = -ENOENT;
-    while (plane) {
+    while (plane != nullptr) {
       ret = plane->IsValidForLayer(layer.second) ? 0 : -EINVAL;
-      if (!ret)
+      if (ret == 0)
         break;
-      if (!plane->zpos_property().is_immutable())
+      if (!plane->GetZPosProperty().is_immutable())
         unused_planes.push_back(plane);
       plane = PopPlane(planes);
     }
 
-    if (!ret) {
+    if (ret == 0) {
       composition->emplace_back(plane, layer.first);
       planes->insert(planes->begin(), unused_planes.begin(),
                      unused_planes.end());
@@ -67,9 +67,9 @@
     return ret;
   }
 
-  int ProvisionPlanesInternal(std::vector<DrmCompositionPlane> *composition,
-                              std::map<size_t, DrmHwcLayer *> &layers,
-                              std::vector<DrmPlane *> *planes);
+  static int ProvisionPlanesInternal(
+      std::vector<DrmCompositionPlane> *composition,
+      std::map<size_t, DrmHwcLayer *> &layers, std::vector<DrmPlane *> *planes);
 
  public:
   // Creates a planner instance
@@ -84,13 +84,13 @@
   //
   // Returns: A tuple with the status of the operation (0 for success) and
   //          a vector of the resulting plan (ie: layer->plane mapping).
-  std::tuple<int, std::vector<DrmCompositionPlane>> ProvisionPlanes(
+  static std::tuple<int, std::vector<DrmCompositionPlane>> ProvisionPlanes(
       std::map<size_t, DrmHwcLayer *> &layers, DrmCrtc *crtc,
       std::vector<DrmPlane *> *primary_planes,
       std::vector<DrmPlane *> *overlay_planes);
 
  private:
-  std::vector<DrmPlane *> GetUsablePlanes(
+  static std::vector<DrmPlane *> GetUsablePlanes(
       DrmCrtc *crtc, std::vector<DrmPlane *> *primary_planes,
       std::vector<DrmPlane *> *overlay_planes);
 };