diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-01 06:24:10 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-01 06:24:10 -0800 |
| commit | 7a44dd183167af0ccfa7a087ef961036aff11099 (patch) | |
| tree | 3e4b5699bd157f9e7fd62b166a6e6213951078fb /sdm | |
| parent | 5003e377182b69d162cd12f1cb375e62ba88eb11 (diff) | |
| parent | df25d20b38c142c8e19f321427b54a6f8faf8169 (diff) | |
| download | android_hardware_qcom_sdm710_display-7a44dd183167af0ccfa7a087ef961036aff11099.tar.gz android_hardware_qcom_sdm710_display-7a44dd183167af0ccfa7a087ef961036aff11099.tar.bz2 android_hardware_qcom_sdm710_display-7a44dd183167af0ccfa7a087ef961036aff11099.zip | |
Merge "sdm:hwc2: Initialize color mode count for virtual display."
Diffstat (limited to 'sdm')
| -rw-r--r-- | sdm/libs/core/display_virtual.cpp | 10 | ||||
| -rw-r--r-- | sdm/libs/core/display_virtual.h | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/sdm/libs/core/display_virtual.cpp b/sdm/libs/core/display_virtual.cpp index dfe4fd3d..d46c8c0b 100644 --- a/sdm/libs/core/display_virtual.cpp +++ b/sdm/libs/core/display_virtual.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 met: @@ -161,6 +161,14 @@ DisplayError DisplayVirtual::Prepare(LayerStack *layer_stack) { return DisplayBase::Prepare(layer_stack); } +DisplayError DisplayVirtual::GetColorModeCount(uint32_t *mode_count) { + lock_guard<recursive_mutex> obj(recursive_mutex_); + + // Color Manager isn't supported for virtual displays. + *mode_count = 1; + + return kErrorNone; +} } // namespace sdm diff --git a/sdm/libs/core/display_virtual.h b/sdm/libs/core/display_virtual.h index eeade9dc..ca154c44 100644 --- a/sdm/libs/core/display_virtual.h +++ b/sdm/libs/core/display_virtual.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 met: @@ -63,6 +63,7 @@ class DisplayVirtual : public DisplayBase { // on virtual display is functional. return kErrorNone; } + virtual DisplayError GetColorModeCount(uint32_t *mode_count); }; } // namespace sdm |