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>
diff --git a/drm/DrmCrtc.cpp b/drm/DrmCrtc.cpp
index 4da08fe..08a1922 100644
--- a/drm/DrmCrtc.cpp
+++ b/drm/DrmCrtc.cpp
@@ -33,19 +33,19 @@
int DrmCrtc::Init() {
int ret = drm_->GetCrtcProperty(*this, "ACTIVE", &active_property_);
- if (ret) {
+ if (ret != 0) {
ALOGE("Failed to get ACTIVE property");
return ret;
}
ret = drm_->GetCrtcProperty(*this, "MODE_ID", &mode_property_);
- if (ret) {
+ if (ret != 0) {
ALOGE("Failed to get MODE_ID property");
return ret;
}
ret = drm_->GetCrtcProperty(*this, "OUT_FENCE_PTR", &out_fence_ptr_property_);
- if (ret) {
+ if (ret != 0) {
ALOGE("Failed to get OUT_FENCE_PTR property");
return ret;
}
diff --git a/drm/DrmDevice.cpp b/drm/DrmDevice.cpp
index 8dee817..a679bf5 100644
--- a/drm/DrmDevice.cpp
+++ b/drm/DrmDevice.cpp
@@ -391,14 +391,6 @@
return nullptr;
}
-DrmPlane *DrmDevice::GetPlane(uint32_t id) const {
- for (const auto &plane : planes_) {
- if (plane->id() == id)
- return plane.get();
- }
- return nullptr;
-}
-
const std::vector<std::unique_ptr<DrmCrtc>> &DrmDevice::crtcs() const {
return crtcs_;
}
diff --git a/drm/DrmDevice.h b/drm/DrmDevice.h
index b5508af..d3effc2 100644
--- a/drm/DrmDevice.h
+++ b/drm/DrmDevice.h
@@ -63,7 +63,6 @@
DrmConnector *GetWritebackConnectorForDisplay(int display) const;
DrmConnector *AvailableWritebackConnector(int display) const;
DrmCrtc *GetCrtcForDisplay(int display) const;
- DrmPlane *GetPlane(uint32_t id) const;
int GetCrtcProperty(const DrmCrtc &crtc, const char *prop_name,
DrmProperty *property) const;
diff --git a/drm/DrmFbImporter.h b/drm/DrmFbImporter.h
index 167aa60..efeb457 100644
--- a/drm/DrmFbImporter.h
+++ b/drm/DrmFbImporter.h
@@ -57,7 +57,7 @@
const std::shared_ptr<DrmDevice> drm_;
uint32_t fb_id_{};
- std::array<GemHandle, HWC_DRM_BO_MAX_PLANES> gem_handles_{};
+ std::array<GemHandle, kHwcDrmBoMaxPlanes> gem_handles_{};
};
class DrmFbImporter {
diff --git a/drm/DrmPlane.cpp b/drm/DrmPlane.cpp
index f6ddad2..8114234 100644
--- a/drm/DrmPlane.cpp
+++ b/drm/DrmPlane.cpp
@@ -133,10 +133,6 @@
return 0;
}
-uint32_t DrmPlane::id() const {
- return id_;
-}
-
bool DrmPlane::GetCrtcSupported(const DrmCrtc &crtc) const {
return ((1 << crtc.pipe()) & possible_crtc_mask_) != 0;
}
@@ -176,7 +172,7 @@
return true;
}
-uint32_t DrmPlane::type() const {
+uint32_t DrmPlane::GetType() const {
return type_;
}
@@ -212,7 +208,7 @@
auto DrmPlane::AtomicSetState(drmModeAtomicReq &pset, DrmHwcLayer &layer,
uint32_t zpos, uint32_t crtc_id) -> int {
- if (!layer.FbIdHandle) {
+ if (!layer.fb_id_handle) {
ALOGE("Expected a valid framebuffer for pset");
return -EINVAL;
}
@@ -234,7 +230,7 @@
}
if (!crtc_property_.AtomicSet(pset, crtc_id) ||
- !fb_property_.AtomicSet(pset, layer.FbIdHandle->GetFbId()) ||
+ !fb_property_.AtomicSet(pset, layer.fb_id_handle->GetFbId()) ||
!crtc_x_property_.AtomicSet(pset, layer.display_frame.left) ||
!crtc_y_property_.AtomicSet(pset, layer.display_frame.top) ||
!crtc_w_property_.AtomicSet(pset, layer.display_frame.right -
@@ -289,7 +285,7 @@
return 0;
}
-const DrmProperty &DrmPlane::zpos_property() const {
+const DrmProperty &DrmPlane::GetZPosProperty() const {
return zpos_property_;
}
diff --git a/drm/DrmPlane.h b/drm/DrmPlane.h
index 6487776..e1ee920 100644
--- a/drm/DrmPlane.h
+++ b/drm/DrmPlane.h
@@ -39,12 +39,10 @@
int Init();
- uint32_t id() const;
-
bool GetCrtcSupported(const DrmCrtc &crtc) const;
bool IsValidForLayer(DrmHwcLayer *layer);
- uint32_t type() const;
+ uint32_t GetType() const;
bool IsFormatSupported(uint32_t format) const;
bool HasNonRgbFormat() const;
@@ -52,7 +50,7 @@
auto AtomicSetState(drmModeAtomicReq &pset, DrmHwcLayer &layer, uint32_t zpos,
uint32_t crtc_id) -> int;
auto AtomicDisablePlane(drmModeAtomicReq &pset) -> int;
- const DrmProperty &zpos_property() const;
+ const DrmProperty &GetZPosProperty() const;
private:
DrmDevice *drm_;
diff --git a/drm/ResourceManager.cpp b/drm/ResourceManager.cpp
index 2cd393f..46f77e4 100644
--- a/drm/ResourceManager.cpp
+++ b/drm/ResourceManager.cpp
@@ -49,12 +49,12 @@
ret = AddDrmDevice(std::string(path_pattern));
} else {
path_pattern[path_len - 1] = '\0';
- for (int idx = 0; !ret; ++idx) {
+ for (int idx = 0; ret == 0; ++idx) {
std::ostringstream path;
path << path_pattern << idx;
struct stat buf {};
- if (stat(path.str().c_str(), &buf))
+ if (stat(path.str().c_str(), &buf) != 0)
break;
if (DrmDevice::IsKMSDev(path.str().c_str()))
@@ -62,22 +62,22 @@
}
}
- if (!num_displays_) {
+ if (num_displays_ == 0) {
ALOGE("Failed to initialize any displays");
- return ret ? -EINVAL : ret;
+ return ret != 0 ? -EINVAL : ret;
}
char scale_with_gpu[PROPERTY_VALUE_MAX];
property_get("vendor.hwc.drm.scale_with_gpu", scale_with_gpu, "0");
scale_with_gpu_ = bool(strncmp(scale_with_gpu, "0", 1));
- if (!BufferInfoGetter::GetInstance()) {
+ if (BufferInfoGetter::GetInstance() == nullptr) {
ALOGE("Failed to initialize BufferInfoGetter");
return -EINVAL;
}
ret = uevent_listener_.Init();
- if (ret) {
+ if (ret != 0) {
ALOGE("Can't initialize event listener %d", ret);
return ret;
}
diff --git a/drm/ResourceManager.h b/drm/ResourceManager.h
index b02bf36..773b350 100644
--- a/drm/ResourceManager.h
+++ b/drm/ResourceManager.h
@@ -34,10 +34,10 @@
int Init();
DrmDevice *GetDrmDevice(int display);
- const std::vector<std::unique_ptr<DrmDevice>> &getDrmDevices() const {
+ const std::vector<std::unique_ptr<DrmDevice>> &GetDrmDevices() const {
return drms_;
}
- int getDisplayCount() const {
+ int GetDisplayCount() const {
return num_displays_;
}
bool ForcedScalingWithGpu() const {