diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-30 02:28:04 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-30 02:28:04 -0800 |
| commit | e3ae4b05ed02543abcf04b6efb3c83ee87e77323 (patch) | |
| tree | 682bf2ad43dc2e508891948b494a4113c21efb5c | |
| parent | bf2b25c1064e856a69821d7e65148f3ed3544ee5 (diff) | |
| parent | a9a915add8afa0f7813ef9ed5e41c752154e7071 (diff) | |
| download | display-e3ae4b05ed02543abcf04b6efb3c83ee87e77323.tar.gz | |
Merge "sdm: Handle AVR and dynamic fps concurrency scenario."
| -rw-r--r-- | sdm/libs/core/fb/hw_primary.cpp | 6 | ||||
| -rw-r--r-- | sdm/libs/core/fb/hw_primary.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sdm/libs/core/fb/hw_primary.cpp b/sdm/libs/core/fb/hw_primary.cpp index 21939200..b484d5e2 100644 --- a/sdm/libs/core/fb/hw_primary.cpp +++ b/sdm/libs/core/fb/hw_primary.cpp @@ -105,6 +105,8 @@ DisplayError HWPrimary::Init() { EnableHotPlugDetection(1); InitializeConfigs(); + avr_prop_disabled_ = Debug::IsAVRDisabled(); + return error; } @@ -296,6 +298,10 @@ DisplayError HWPrimary::SetDisplayAttributes(uint32_t index) { DisplayError HWPrimary::SetRefreshRate(uint32_t refresh_rate) { char node_path[kMaxStringLength] = {0}; + if (hw_resource_.has_avr && !avr_prop_disabled_) { + return kErrorNotSupported; + } + if (refresh_rate == display_attributes_.fps) { return kErrorNone; } diff --git a/sdm/libs/core/fb/hw_primary.h b/sdm/libs/core/fb/hw_primary.h index ae453184..bd6ea2f9 100644 --- a/sdm/libs/core/fb/hw_primary.h +++ b/sdm/libs/core/fb/hw_primary.h @@ -85,6 +85,7 @@ class HWPrimary : public HWDevice { const char *kBrightnessNode = "/sys/class/leds/lcd-backlight/brightness"; const char *kAutoRefreshNode = "/sys/devices/virtual/graphics/fb0/msm_cmd_autorefresh_en"; bool auto_refresh_ = false; + bool avr_prop_disabled_ = false; }; } // namespace sdm |