diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-22 22:42:28 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-22 22:42:28 -0700 |
commit | 88c1c291c99bee0c5f7217506af5eb6c18112d23 (patch) | |
tree | dc9748f01c9571cde0363ac65c274d6c0e2ac203 /sdm | |
parent | 155a6fc323d805420439e375f37fd327365d5ee6 (diff) | |
parent | 2fc16924f48e3a8a12fe2eb9fdbedbdaf832a9a8 (diff) | |
download | display-88c1c291c99bee0c5f7217506af5eb6c18112d23.tar.gz |
Merge "sdm: comply with treble guidelines"
Diffstat (limited to 'sdm')
-rw-r--r-- | sdm/include/utils/debug.h | 1 | ||||
-rw-r--r-- | sdm/libs/core/display_base.cpp | 2 | ||||
-rw-r--r-- | sdm/libs/hwc2/hwc_display.cpp | 2 | ||||
-rw-r--r-- | sdm/libs/hwc2/hwc_display_primary.cpp | 3 | ||||
-rw-r--r-- | sdm/libs/hwc2/hwc_tonemapper.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sdm/include/utils/debug.h b/sdm/include/utils/debug.h index a1e765ae..e4ec8e0c 100644 --- a/sdm/include/utils/debug.h +++ b/sdm/include/utils/debug.h @@ -34,6 +34,7 @@ #include <core/sdm_types.h> #include <core/debug_interface.h> #include <core/display_interface.h> +#include <display_properties.h> #define DLOG(tag, method, format, ...) Debug::Get()->method(tag, __CLASS__ "::%s: " format, \ __FUNCTION__, ##__VA_ARGS__) diff --git a/sdm/libs/core/display_base.cpp b/sdm/libs/core/display_base.cpp index 3bb34414..29050f3c 100644 --- a/sdm/libs/core/display_base.cpp +++ b/sdm/libs/core/display_base.cpp @@ -114,7 +114,7 @@ DisplayError DisplayBase::Init() { DisplayBase::SetMaxMixerStages(max_mixer_stages); } - Debug::Get()->GetProperty("sdm.disable_hdr_lut_gen", &disable_hdr_lut_gen_); + Debug::Get()->GetProperty(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/hwc2/hwc_display.cpp b/sdm/libs/hwc2/hwc_display.cpp index 219fab57..0b5676ad 100644 --- a/sdm/libs/hwc2/hwc_display.cpp +++ b/sdm/libs/hwc2/hwc_display.cpp @@ -364,7 +364,7 @@ int HWCDisplay::Init() { } validated_ = false; - HWCDebugHandler::Get()->GetProperty("sys.hwc_disable_hdr", &disable_hdr_handling_); + HWCDebugHandler::Get()->GetProperty(DISABLE_HDR, &disable_hdr_handling_); if (disable_hdr_handling_) { DLOGI("HDR Handling disabled"); } diff --git a/sdm/libs/hwc2/hwc_display_primary.cpp b/sdm/libs/hwc2/hwc_display_primary.cpp index b8a4c7cf..75ac0f98 100644 --- a/sdm/libs/hwc2/hwc_display_primary.cpp +++ b/sdm/libs/hwc2/hwc_display_primary.cpp @@ -113,8 +113,7 @@ int HWCDisplayPrimary::Init() { } color_mode_ = new HWCColorMode(display_intf_); color_mode_->Init(); - HWCDebugHandler::Get()->GetProperty("vendor.display.enable_default_color_mode", - &default_mode_status_); + HWCDebugHandler::Get()->GetProperty(ENABLE_DEFAULT_COLOR_MODE, &default_mode_status_); return status; } diff --git a/sdm/libs/hwc2/hwc_tonemapper.cpp b/sdm/libs/hwc2/hwc_tonemapper.cpp index 2ae1afc1..22896f94 100644 --- a/sdm/libs/hwc2/hwc_tonemapper.cpp +++ b/sdm/libs/hwc2/hwc_tonemapper.cpp @@ -333,7 +333,7 @@ void HWCToneMapper::DumpToneMapOutput(ToneMapSession *session, int *acquire_fd) DisplayError HWCToneMapper::AcquireToneMapSession(Layer *layer, uint32_t *session_index, PrimariesTransfer blend_cs) { - // When the property sdm.disable_hdr_lut_gen is set, the lutEntries and gridEntries in + // When the property vendor.display.disable_hdr_lut_gen is set, the lutEntries and gridEntries in // the Lut3d will be NULL, clients needs to allocate the memory and set correct 3D Lut // for Tonemapping. if (!layer->lut_3d.lutEntries || !layer->lut_3d.dim) { |