sdm: Use generic libdebug utility.
CRs-Fixed: 2211061
Change-Id: Ib949c40ff63a61a4476876c45357a40a702c9a01
diff --git a/sdm/libs/core/Android.mk b/sdm/libs/core/Android.mk
index d8c9f85..d4aa933 100644
--- a/sdm/libs/core/Android.mk
+++ b/sdm/libs/core/Android.mk
@@ -10,7 +10,7 @@
LOCAL_CFLAGS := -fno-operator-names -Wno-unused-parameter -DLOG_TAG=\"SDM\" \
$(common_flags)
LOCAL_HW_INTF_PATH_1 := fb
-LOCAL_SHARED_LIBRARIES := libdl libsdmutils
+LOCAL_SHARED_LIBRARIES := libdl libdisplaydebug libsdmutils
ifneq ($(TARGET_IS_HEADLESS), true)
LOCAL_CFLAGS += -isystem external/libdrm
@@ -65,7 +65,6 @@
LOCAL_COPY_HEADERS = $(SDM_HEADER_PATH)/core/buffer_allocator.h \
$(SDM_HEADER_PATH)/core/buffer_sync_handler.h \
$(SDM_HEADER_PATH)/core/core_interface.h \
- $(SDM_HEADER_PATH)/core/debug_interface.h \
$(SDM_HEADER_PATH)/core/display_interface.h \
$(SDM_HEADER_PATH)/core/layer_buffer.h \
$(SDM_HEADER_PATH)/core/layer_stack.h \
diff --git a/sdm/libs/core/core_interface.cpp b/sdm/libs/core/core_interface.cpp
index 911ad01..b880298 100644
--- a/sdm/libs/core/core_interface.cpp
+++ b/sdm/libs/core/core_interface.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2014 - 2015, The Linux Foundation. All rights reserved.
+* Copyright (c) 2014 - 2015, 2018 The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -51,23 +51,13 @@
Locker locker;
} g_core;
-// TODO(user): Have a single structure handle carries all the interface pointers.
-DisplayError CoreInterface::CreateCore(DebugHandler *debug_handler,
- BufferAllocator *buffer_allocator,
- BufferSyncHandler *buffer_sync_handler,
- CoreInterface **interface, uint32_t client_version) {
- return CreateCore(debug_handler, buffer_allocator, buffer_sync_handler, NULL,
- interface, client_version);
-}
-
-DisplayError CoreInterface::CreateCore(DebugHandler *debug_handler,
- BufferAllocator *buffer_allocator,
+DisplayError CoreInterface::CreateCore(BufferAllocator *buffer_allocator,
BufferSyncHandler *buffer_sync_handler,
SocketHandler *socket_handler,
CoreInterface **interface, uint32_t client_version) {
SCOPE_LOCK(g_core.locker);
- if (!debug_handler || !buffer_allocator || !buffer_sync_handler || !interface) {
+ if (!buffer_allocator || !buffer_sync_handler || !interface) {
return kErrorParameters;
}
@@ -86,8 +76,6 @@
return kErrorUndefined;
}
- Debug::SetDebugHandler(debug_handler);
-
// Create appropriate CoreImpl object based on client version.
if (GET_REVISION(client_version) == CoreImpl::kRevision) {
core_impl = new CoreImpl(buffer_allocator, buffer_sync_handler, socket_handler);
diff --git a/sdm/libs/core/display_base.cpp b/sdm/libs/core/display_base.cpp
index 18241d9..871a04f 100644
--- a/sdm/libs/core/display_base.cpp
+++ b/sdm/libs/core/display_base.cpp
@@ -113,7 +113,7 @@
DisplayBase::SetMaxMixerStages(max_mixer_stages);
}
- Debug::Get()->GetProperty("sdm.disable_hdr_lut_gen", &disable_hdr_lut_gen_);
+ Debug::GetProperty("sdm.disable_hdr_lut_gen", &disable_hdr_lut_gen_);
// TODO(user): Temporary changes, to be removed when DRM driver supports
// Partial update with Destination scaler enabled.
SetPUonDestScaler();
diff --git a/sdm/libs/core/drm/hw_info_drm.cpp b/sdm/libs/core/drm/hw_info_drm.cpp
index ae3c424..dc5a557 100644
--- a/sdm/libs/core/drm/hw_info_drm.cpp
+++ b/sdm/libs/core/drm/hw_info_drm.cpp
@@ -68,7 +68,6 @@
using drm_utils::DRMMaster;
using drm_utils::DRMResMgr;
-using drm_utils::DRMLogger;
using drm_utils::DRMLibLoader;
using sde_drm::GetDRMManager;
using sde_drm::DRMPlanesInfo;
@@ -83,25 +82,6 @@
namespace sdm {
-class DRMLoggerImpl : public DRMLogger {
- public:
-#define PRINTLOG(tag, method, format, buf) \
- va_list list; \
- va_start(list, format); \
- vsnprintf(buf, sizeof(buf), format, list); \
- va_end(list); \
- Debug::Get()->method(tag, "%s", buf);
-
- void Error(const char *format, ...) { PRINTLOG(kTagNone, Error, format, buf_); }
- void Warning(const char *format, ...) { PRINTLOG(kTagDriverConfig, Warning, format, buf_); }
- void Info(const char *format, ...) { PRINTLOG(kTagDriverConfig, Info, format, buf_); }
- void Debug(const char *format, ...) { PRINTLOG(kTagDriverConfig, Debug, format, buf_); }
- void Verbose(const char *format, ...) { PRINTLOG(kTagDriverConfig, Verbose, format, buf_); }
-
- private:
- char buf_[1024] = {};
-};
-
static HWQseedStepVersion GetQseedStepVersion(sde_drm::QSEEDStepVersion drm_version) {
HWQseedStepVersion sdm_version;
switch (drm_version) {
@@ -133,7 +113,6 @@
HWResourceInfo *HWInfoDRM::hw_resource_ = nullptr;
HWInfoDRM::HWInfoDRM() {
- DRMLogger::Set(new DRMLoggerImpl());
default_mode_ = (DRMLibLoader::GetInstance()->IsLoaded() == false);
if (!default_mode_) {
DRMMaster *drm_master = {};
@@ -228,7 +207,7 @@
// through property
int value = 0;
bool disable_dest_scalar = false;
- if (Debug::Get()->GetProperty("sdm.debug.disable_dest_scalar", &value) == kErrorNone) {
+ if (Debug::GetProperty("sdm.debug.disable_dest_scalar", &value) == kErrorNone) {
disable_dest_scalar = (value == 1);
}
DynLib extension_lib;
diff --git a/sdm/libs/core/fb/hw_hdmi.cpp b/sdm/libs/core/fb/hw_hdmi.cpp
index e339908..532c3ba 100644
--- a/sdm/libs/core/fb/hw_hdmi.cpp
+++ b/sdm/libs/core/fb/hw_hdmi.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2015 - 2017, The Linux Foundation. All rights reserved.
+* Copyright (c) 2015 - 2018, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -675,8 +675,8 @@
}
ssize_t length = 0;
- bool prop_read_success = Debug::GetProperty(name, property_value);
- if (!prop_read_success) {
+ DisplayError error = Debug::GetProperty(name, property_value);
+ if (error != kErrorNone) {
return;
}
diff --git a/sdm/libs/hwc2/Android.mk b/sdm/libs/hwc2/Android.mk
index 0e839ce..483d7e7 100644
--- a/sdm/libs/hwc2/Android.mk
+++ b/sdm/libs/hwc2/Android.mk
@@ -19,9 +19,9 @@
LOCAL_SHARED_LIBRARIES := libsdmcore libqservice libbinder libhardware libhardware_legacy \
libutils libcutils libsync libqdutils libqdMetaData \
- libsdmutils libc++ liblog libgrallocutils libui libgpu_tonemapper \
- libhidlbase libhidltransport vendor.display.config@1.0 \
- android.hardware.graphics.mapper@2.0\
+ libdisplaydebug libsdmutils libc++ liblog libgrallocutils libui \
+ libgpu_tonemapper libhidlbase libhidltransport \
+ vendor.display.config@1.0 android.hardware.graphics.mapper@2.0 \
android.hardware.graphics.allocator@2.0
ifeq ($(display_config_version), DISPLAY_CONFIG_1_1)
diff --git a/sdm/libs/hwc2/hwc_debugger.cpp b/sdm/libs/hwc2/hwc_debugger.cpp
index 8b51799..39416c5 100644
--- a/sdm/libs/hwc2/hwc_debugger.cpp
+++ b/sdm/libs/hwc2/hwc_debugger.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2014 - 2017, The Linux Foundation. All rights reserved.
+* Copyright (c) 2014 - 2018, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -35,147 +35,161 @@
namespace sdm {
HWCDebugHandler HWCDebugHandler::debug_handler_;
-std::bitset<32> HWCDebugHandler::debug_flags_ = 0x1;
-int32_t HWCDebugHandler::verbose_level_ = 0x0;
+
+HWCDebugHandler::HWCDebugHandler() {
+ DebugHandler::Set(HWCDebugHandler::Get());
+}
void HWCDebugHandler::DebugAll(bool enable, int verbose_level) {
if (enable) {
- debug_flags_ = 0x7FFFFFFF;
+ debug_handler_.log_mask_ = 0x7FFFFFFF;
if (verbose_level) {
- // Enable verbose scalar logs only when explicitely enabled
- debug_flags_[kTagScalar] = 0;
+ // Enable verbose scalar logs only when explicitly enabled
+ debug_handler_.log_mask_[kTagScalar] = 0;
}
- verbose_level_ = verbose_level;
+ debug_handler_.verbose_level_ = verbose_level;
} else {
- debug_flags_ = 0x1; // kTagNone should always be printed.
- verbose_level_ = 0;
+ debug_handler_.log_mask_ = 0x1; // kTagNone should always be printed.
+ debug_handler_.verbose_level_ = 0;
}
+
+ DebugHandler::SetLogMask(debug_handler_.log_mask_);
}
void HWCDebugHandler::DebugResources(bool enable, int verbose_level) {
if (enable) {
- debug_flags_[kTagResources] = 1;
- verbose_level_ = verbose_level;
+ debug_handler_.log_mask_[kTagResources] = 1;
+ debug_handler_.verbose_level_ = verbose_level;
} else {
- debug_flags_[kTagResources] = 0;
- verbose_level_ = 0;
+ debug_handler_.log_mask_[kTagResources] = 0;
+ debug_handler_.verbose_level_ = 0;
}
+
+ DebugHandler::SetLogMask(debug_handler_.log_mask_);
}
void HWCDebugHandler::DebugStrategy(bool enable, int verbose_level) {
if (enable) {
- debug_flags_[kTagStrategy] = 1;
- verbose_level_ = verbose_level;
+ debug_handler_.log_mask_[kTagStrategy] = 1;
+ debug_handler_.verbose_level_ = verbose_level;
} else {
- debug_flags_[kTagStrategy] = 0;
- verbose_level_ = 0;
+ debug_handler_.log_mask_[kTagStrategy] = 0;
+ debug_handler_.verbose_level_ = 0;
}
+
+ DebugHandler::SetLogMask(debug_handler_.log_mask_);
}
void HWCDebugHandler::DebugCompManager(bool enable, int verbose_level) {
if (enable) {
- debug_flags_[kTagCompManager] = 1;
- verbose_level_ = verbose_level;
+ debug_handler_.log_mask_[kTagCompManager] = 1;
+ debug_handler_.verbose_level_ = verbose_level;
} else {
- debug_flags_[kTagCompManager] = 0;
- verbose_level_ = 0;
+ debug_handler_.log_mask_[kTagCompManager] = 0;
+ debug_handler_.verbose_level_ = 0;
}
+
+ DebugHandler::SetLogMask(debug_handler_.log_mask_);
}
void HWCDebugHandler::DebugDriverConfig(bool enable, int verbose_level) {
if (enable) {
- debug_flags_[kTagDriverConfig] = 1;
- verbose_level_ = verbose_level;
+ debug_handler_.log_mask_[kTagDriverConfig] = 1;
+ debug_handler_.verbose_level_ = verbose_level;
} else {
- debug_flags_[kTagDriverConfig] = 0;
- verbose_level_ = 0;
+ debug_handler_.log_mask_[kTagDriverConfig] = 0;
+ debug_handler_.verbose_level_ = 0;
}
+
+ DebugHandler::SetLogMask(debug_handler_.log_mask_);
}
void HWCDebugHandler::DebugRotator(bool enable, int verbose_level) {
if (enable) {
- debug_flags_[kTagRotator] = 1;
- verbose_level_ = verbose_level;
+ debug_handler_.log_mask_[kTagRotator] = 1;
+ debug_handler_.verbose_level_ = verbose_level;
} else {
- debug_flags_[kTagRotator] = 0;
- verbose_level_ = 0;
+ debug_handler_.log_mask_[kTagRotator] = 0;
+ debug_handler_.verbose_level_ = 0;
}
+
+ DebugHandler::SetLogMask(debug_handler_.log_mask_);
}
void HWCDebugHandler::DebugScalar(bool enable, int verbose_level) {
if (enable) {
- debug_flags_[kTagScalar] = 1;
- verbose_level_ = verbose_level;
+ debug_handler_.log_mask_[kTagScalar] = 1;
+ debug_handler_.verbose_level_ = verbose_level;
} else {
- debug_flags_[kTagScalar] = 0;
- verbose_level_ = 0;
+ debug_handler_.log_mask_[kTagScalar] = 0;
+ debug_handler_.verbose_level_ = 0;
}
+
+ DebugHandler::SetLogMask(debug_handler_.log_mask_);
}
void HWCDebugHandler::DebugQdcm(bool enable, int verbose_level) {
if (enable) {
- debug_flags_[kTagQDCM] = 1;
- verbose_level_ = verbose_level;
+ debug_handler_.log_mask_[kTagQDCM] = 1;
+ debug_handler_.verbose_level_ = verbose_level;
} else {
- debug_flags_[kTagQDCM] = 0;
- verbose_level_ = 0;
+ debug_handler_.log_mask_[kTagQDCM] = 0;
+ debug_handler_.verbose_level_ = 0;
}
+
+ DebugHandler::SetLogMask(debug_handler_.log_mask_);
}
void HWCDebugHandler::DebugClient(bool enable, int verbose_level) {
if (enable) {
- debug_flags_[kTagClient] = 1;
- verbose_level_ = verbose_level;
+ debug_handler_.log_mask_[kTagClient] = 1;
+ debug_handler_.verbose_level_ = verbose_level;
} else {
- debug_flags_[kTagClient] = 0;
- verbose_level_ = 0;
+ debug_handler_.log_mask_[kTagClient] = 0;
+ debug_handler_.verbose_level_ = 0;
}
+
+ DebugHandler::SetLogMask(debug_handler_.log_mask_);
}
void HWCDebugHandler::DebugDisplay(bool enable, int verbose_level) {
if (enable) {
- debug_flags_[kTagDisplay] = 1;
- verbose_level_ = verbose_level;
+ debug_handler_.log_mask_[kTagDisplay] = 1;
+ debug_handler_.verbose_level_ = verbose_level;
} else {
- debug_flags_[kTagDisplay] = 0;
- verbose_level_ = 0;
+ debug_handler_.log_mask_[kTagDisplay] = 0;
+ debug_handler_.verbose_level_ = 0;
}
+
+ DebugHandler::SetLogMask(debug_handler_.log_mask_);
}
-void HWCDebugHandler::Error(DebugTag tag, const char *format, ...) {
- if (debug_flags_[tag]) {
- va_list list;
- va_start(list, format);
- __android_log_vprint(ANDROID_LOG_ERROR, LOG_TAG, format, list);
- }
+void HWCDebugHandler::Error(const char *format, ...) {
+ va_list list;
+ va_start(list, format);
+ __android_log_vprint(ANDROID_LOG_ERROR, LOG_TAG, format, list);
}
-void HWCDebugHandler::Warning(DebugTag tag, const char *format, ...) {
- if (debug_flags_[tag]) {
- va_list list;
- va_start(list, format);
- __android_log_vprint(ANDROID_LOG_WARN, LOG_TAG, format, list);
- }
+void HWCDebugHandler::Warning(const char *format, ...) {
+ va_list list;
+ va_start(list, format);
+ __android_log_vprint(ANDROID_LOG_WARN, LOG_TAG, format, list);
}
-void HWCDebugHandler::Info(DebugTag tag, const char *format, ...) {
- if (debug_flags_[tag]) {
- va_list list;
- va_start(list, format);
- __android_log_vprint(ANDROID_LOG_INFO, LOG_TAG, format, list);
- }
+void HWCDebugHandler::Info(const char *format, ...) {
+ va_list list;
+ va_start(list, format);
+ __android_log_vprint(ANDROID_LOG_INFO, LOG_TAG, format, list);
}
-void HWCDebugHandler::Debug(DebugTag tag, const char *format, ...) {
- if (debug_flags_[tag]) {
- va_list list;
- va_start(list, format);
- __android_log_vprint(ANDROID_LOG_DEBUG, LOG_TAG, format, list);
- }
+void HWCDebugHandler::Debug(const char *format, ...) {
+ va_list list;
+ va_start(list, format);
+ __android_log_vprint(ANDROID_LOG_DEBUG, LOG_TAG, format, list);
}
-void HWCDebugHandler::Verbose(DebugTag tag, const char *format, ...) {
- if (debug_flags_[tag] && verbose_level_) {
+void HWCDebugHandler::Verbose(const char *format, ...) {
+ if (debug_handler_.verbose_level_) {
va_list list;
va_start(list, format);
__android_log_vprint(ANDROID_LOG_VERBOSE, LOG_TAG, format, list);
@@ -202,7 +216,7 @@
return value;
}
-DisplayError HWCDebugHandler::GetProperty(const char *property_name, int *value) {
+int HWCDebugHandler::GetProperty(const char *property_name, int *value) {
char property[PROPERTY_VALUE_MAX];
if (property_get(property_name, property, NULL) > 0) {
@@ -213,7 +227,7 @@
return kErrorNotSupported;
}
-DisplayError HWCDebugHandler::GetProperty(const char *property_name, char *value) {
+int HWCDebugHandler::GetProperty(const char *property_name, char *value) {
if (property_get(property_name, value, NULL) > 0) {
return kErrorNone;
}
@@ -221,13 +235,5 @@
return kErrorNotSupported;
}
-DisplayError HWCDebugHandler::SetProperty(const char *property_name, const char *value) {
- if (property_set(property_name, value) == 0) {
- return kErrorNone;
- }
-
- return kErrorNotSupported;
-}
-
} // namespace sdm
diff --git a/sdm/libs/hwc2/hwc_debugger.h b/sdm/libs/hwc2/hwc_debugger.h
index 3a3d787..7ebca8a 100644
--- a/sdm/libs/hwc2/hwc_debugger.h
+++ b/sdm/libs/hwc2/hwc_debugger.h
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2014 - 2017, The Linux Foundation. All rights reserved.
+* Copyright (c) 2014 - 2018, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -33,15 +33,18 @@
#define ATRACE_TAG (ATRACE_TAG_GRAPHICS | ATRACE_TAG_HAL)
#include <core/sdm_types.h>
-#include <core/debug_interface.h>
+#include <debug_handler.h>
#include <log/log.h>
#include <utils/Trace.h>
#include <bitset>
namespace sdm {
+using display::DebugHandler;
+
class HWCDebugHandler : public DebugHandler {
public:
+ HWCDebugHandler();
static inline DebugHandler* Get() { return &debug_handler_; }
static const char* DumpDir() { return "/data/vendor/display"; }
@@ -57,22 +60,21 @@
static void DebugDisplay(bool enable, int verbose_level);
static int GetIdleTimeoutMs();
- virtual void Error(DebugTag tag, const char *format, ...);
- virtual void Warning(DebugTag tag, const char *format, ...);
- virtual void Info(DebugTag tag, const char *format, ...);
- virtual void Debug(DebugTag tag, const char *format, ...);
- virtual void Verbose(DebugTag tag, const char *format, ...);
+ virtual void Error(const char *format, ...);
+ virtual void Warning(const char *format, ...);
+ virtual void Info(const char *format, ...);
+ virtual void Debug(const char *format, ...);
+ virtual void Verbose(const char *format, ...);
virtual void BeginTrace(const char *class_name, const char *function_name,
const char *custom_string);
virtual void EndTrace();
- virtual DisplayError GetProperty(const char *property_name, int *value);
- virtual DisplayError GetProperty(const char *property_name, char *value);
- virtual DisplayError SetProperty(const char *property_name, const char *value);
+ virtual int GetProperty(const char *property_name, int *value);
+ virtual int GetProperty(const char *property_name, char *value);
private:
static HWCDebugHandler debug_handler_;
- static std::bitset<32> debug_flags_;
- static int32_t verbose_level_;
+ std::bitset<32> log_mask_;
+ int32_t verbose_level_;
};
} // namespace sdm
diff --git a/sdm/libs/hwc2/hwc_session.cpp b/sdm/libs/hwc2/hwc_session.cpp
index 8a69776..bdc84aa 100644
--- a/sdm/libs/hwc2/hwc_session.cpp
+++ b/sdm/libs/hwc2/hwc_session.cpp
@@ -171,8 +171,8 @@
} else {
g_hwc_uevent_.Register(this);
- error = CoreInterface::CreateCore(HWCDebugHandler::Get(), &buffer_allocator_,
- &buffer_sync_handler_, &socket_handler_, &core_intf_);
+ error = CoreInterface::CreateCore(&buffer_allocator_, &buffer_sync_handler_, &socket_handler_,
+ &core_intf_);
error = core_intf_->GetFirstDisplayInterfaceType(&hw_disp_info);
diff --git a/sdm/libs/utils/Android.mk b/sdm/libs/utils/Android.mk
index 481ea39..a9d705c 100644
--- a/sdm/libs/utils/Android.mk
+++ b/sdm/libs/utils/Android.mk
@@ -14,6 +14,7 @@
formats.cpp \
utils.cpp
+LOCAL_SHARED_LIBRARIES := libdisplaydebug
include $(BUILD_SHARED_LIBRARY)
SDM_HEADER_PATH := ../../include
diff --git a/sdm/libs/utils/debug.cpp b/sdm/libs/utils/debug.cpp
index ee881ef..62a6cad 100644
--- a/sdm/libs/utils/debug.cpp
+++ b/sdm/libs/utils/debug.cpp
@@ -35,21 +35,16 @@
namespace sdm {
-Debug Debug::debug_;
-
-Debug::Debug() : debug_handler_(&default_debug_handler_) {
-}
-
int Debug::GetSimulationFlag() {
int value = 0;
- debug_.debug_handler_->GetProperty("sdm.composition_simulation", &value);
+ DebugHandler::Get()->GetProperty("sdm.composition_simulation", &value);
return value;
}
bool Debug::GetExternalResolution(char *value) {
uint32_t retval = 0;
- debug_.debug_handler_->GetProperty("hw.hdmi.resolution", value);
+ DebugHandler::Get()->GetProperty("hw.hdmi.resolution", value);
if (value[0]) {
retval = 1;
}
@@ -61,8 +56,8 @@
int active_val = IDLE_TIMEOUT_ACTIVE_MS;
int inactive_val = IDLE_TIMEOUT_INACTIVE_MS;
- debug_.debug_handler_->GetProperty("sdm.idle_time", &active_val);
- debug_.debug_handler_->GetProperty("sdm.idle_time.inactive", &inactive_val);
+ DebugHandler::Get()->GetProperty("sdm.idle_time", &active_val);
+ DebugHandler::Get()->GetProperty("sdm.idle_time.inactive", &inactive_val);
*active_ms = UINT32(active_val);
*inactive_ms = UINT32(inactive_val);
@@ -70,21 +65,21 @@
int Debug::GetBootAnimLayerCount() {
int value = 0;
- debug_.debug_handler_->GetProperty("sdm.boot_anim_layer_count", &value);
+ DebugHandler::Get()->GetProperty("sdm.boot_anim_layer_count", &value);
return value;
}
bool Debug::IsRotatorDownScaleDisabled() {
int value = 0;
- debug_.debug_handler_->GetProperty("sdm.debug.rotator_downscale", &value);
+ DebugHandler::Get()->GetProperty("sdm.debug.rotator_downscale", &value);
return (value == 1);
}
bool Debug::IsDecimationDisabled() {
int value = 0;
- debug_.debug_handler_->GetProperty("sdm.disable_decimation", &value);
+ DebugHandler::Get()->GetProperty("sdm.disable_decimation", &value);
return (value == 1);
}
@@ -93,13 +88,13 @@
int value = -1;
switch (display_type) {
case kPrimary:
- debug_.debug_handler_->GetProperty("sdm.primary.mixer_stages", &value);
+ DebugHandler::Get()->GetProperty("sdm.primary.mixer_stages", &value);
break;
case kHDMI:
- debug_.debug_handler_->GetProperty("sdm.external.mixer_stages", &value);
+ DebugHandler::Get()->GetProperty("sdm.external.mixer_stages", &value);
break;
case kVirtual:
- debug_.debug_handler_->GetProperty("sdm.virtual.mixer_stages", &value);
+ DebugHandler::Get()->GetProperty("sdm.virtual.mixer_stages", &value);
break;
default:
break;
@@ -110,35 +105,35 @@
int Debug::GetMaxUpscale() {
int value = 0;
- debug_.debug_handler_->GetProperty("sdm.max_upscale", &value);
+ DebugHandler::Get()->GetProperty("sdm.max_upscale", &value);
return value;
}
bool Debug::IsVideoModeEnabled() {
int value = 0;
- debug_.debug_handler_->GetProperty("sdm.video_mode_panel", &value);
+ DebugHandler::Get()->GetProperty("sdm.video_mode_panel", &value);
return (value == 1);
}
bool Debug::IsRotatorUbwcDisabled() {
int value = 0;
- debug_.debug_handler_->GetProperty("sdm.debug.rotator_disable_ubwc", &value);
+ DebugHandler::Get()->GetProperty("sdm.debug.rotator_disable_ubwc", &value);
return (value == 1);
}
bool Debug::IsRotatorSplitDisabled() {
int value = 0;
- debug_.debug_handler_->GetProperty("sdm.debug.disable_rotator_split", &value);
+ DebugHandler::Get()->GetProperty("sdm.debug.disable_rotator_split", &value);
return (value == 1);
}
bool Debug::IsScalarDisabled() {
int value = 0;
- debug_.debug_handler_->GetProperty("sdm.debug.disable_scalar", &value);
+ DebugHandler::Get()->GetProperty("sdm.debug.disable_scalar", &value);
return (value == 1);
}
@@ -147,10 +142,10 @@
int ubwc_disabled = 0;
int ubwc_framebuffer = 0;
- debug_.debug_handler_->GetProperty("debug.gralloc.gfx_ubwc_disable", &ubwc_disabled);
+ DebugHandler::Get()->GetProperty("debug.gralloc.gfx_ubwc_disable", &ubwc_disabled);
if (!ubwc_disabled) {
- debug_.debug_handler_->GetProperty("debug.gralloc.enable_fb_ubwc", &ubwc_framebuffer);
+ DebugHandler::Get()->GetProperty("debug.gralloc.enable_fb_ubwc", &ubwc_framebuffer);
}
return (ubwc_framebuffer == 1);
@@ -158,28 +153,28 @@
bool Debug::IsAVRDisabled() {
int value = 0;
- debug_.debug_handler_->GetProperty("sdm.debug.disable_avr", &value);
+ DebugHandler::Get()->GetProperty("sdm.debug.disable_avr", &value);
return (value == 1);
}
bool Debug::IsExtAnimDisabled() {
int value = 0;
- debug_.debug_handler_->GetProperty("sys.disable_ext_animation", &value);
+ DebugHandler::Get()->GetProperty("sys.disable_ext_animation", &value);
return (value == 1);
}
bool Debug::IsPartialSplitDisabled() {
int value = 0;
- debug_.debug_handler_->GetProperty("sdm.debug.disable_partial_split", &value);
+ DebugHandler::Get()->GetProperty("sdm.debug.disable_partial_split", &value);
return (value == 1);
}
bool Debug::IsSrcSplitPreferred() {
int value = 0;
- debug_.debug_handler_->GetProperty("sdm.debug.prefersplit", &value);
+ DebugHandler::Get()->GetProperty("sdm.debug.prefersplit", &value);
return (value == 1);
}
@@ -187,9 +182,9 @@
DisplayError Debug::GetMixerResolution(uint32_t *width, uint32_t *height) {
char value[64] = {};
- DisplayError error = debug_.debug_handler_->GetProperty("sdm.mixer_resolution", value);
- if (error !=kErrorNone) {
- return error;
+ int error = DebugHandler::Get()->GetProperty("sdm.mixer_resolution", value);
+ if (error != 0) {
+ return kErrorUndefined;
}
std::string str(value);
@@ -203,9 +198,9 @@
DisplayError Debug::GetReducedConfig(uint32_t *num_vig_pipes, uint32_t *num_dma_pipes) {
char value[64] = {};
- DisplayError error = debug_.debug_handler_->GetProperty("sdm.debug.reduced_config", value);
- if (error != kErrorNone) {
- return error;
+ int error = DebugHandler::Get()->GetProperty("sdm.debug.reduced_config", value);
+ if (error != 0) {
+ return kErrorUndefined;
}
std::string str(value);
@@ -218,25 +213,25 @@
int Debug::GetExtMaxlayers() {
int max_external_layers = 0;
- debug_.debug_handler_->GetProperty("sdm.max_external_layers", &max_external_layers);
+ DebugHandler::Get()->GetProperty("sdm.max_external_layers", &max_external_layers);
return std::max(max_external_layers, 2);
}
-bool Debug::GetProperty(const char* property_name, char* value) {
- if (debug_.debug_handler_->GetProperty(property_name, value) != kErrorNone) {
- return false;
+DisplayError Debug::GetProperty(const char *property_name, char *value) {
+ if (DebugHandler::Get()->GetProperty(property_name, value)) {
+ return kErrorUndefined;
}
- return true;
+ return kErrorNone;
}
-bool Debug::SetProperty(const char* property_name, const char* value) {
- if (debug_.debug_handler_->SetProperty(property_name, value) != kErrorNone) {
- return false;
+DisplayError Debug::GetProperty(const char *property_name, int *value) {
+ if (DebugHandler::Get()->GetProperty(property_name, value)) {
+ return kErrorUndefined;
}
- return true;
+ return kErrorNone;
}
} // namespace sdm