diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-06-30 20:56:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-30 20:56:53 -0700 |
| commit | e81f027c38e8c55880beea16a536e04d761f3930 (patch) | |
| tree | 4cb752409b64d1a4e91ec85ba0173d5148322cb9 | |
| parent | 9c38bc0539a0a8dcb7a0ea500d6afd94d45e6e99 (diff) | |
| parent | 37605f8d2ac27adec17e9e2bb0ccfd09d6e6d70a (diff) | |
| download | hardware_qcom_display-e81f027c38e8c55880beea16a536e04d761f3930.tar.gz hardware_qcom_display-e81f027c38e8c55880beea16a536e04d761f3930.tar.bz2 hardware_qcom_display-e81f027c38e8c55880beea16a536e04d761f3930.zip | |
Merge "sdm: Remain display framerate after dynamic resolution change" into dev-2.0
| -rw-r--r-- | sdm/libs/hwc/hwc_display_external.cpp | 2 | ||||
| -rw-r--r-- | sdm/libs/hwc/hwc_session.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sdm/libs/hwc/hwc_display_external.cpp b/sdm/libs/hwc/hwc_display_external.cpp index 47fb2e5fb..ad46783a8 100644 --- a/sdm/libs/hwc/hwc_display_external.cpp +++ b/sdm/libs/hwc/hwc_display_external.cpp @@ -290,7 +290,7 @@ uint32_t HWCDisplayExternal::GetOptimalRefreshRate(bool one_updating_layer) { return metadata_refresh_rate_; } - return max_refresh_rate_; + return current_refresh_rate_; } int HWCDisplayExternal::Perform(uint32_t operation, ...) { diff --git a/sdm/libs/hwc/hwc_session.cpp b/sdm/libs/hwc/hwc_session.cpp index 77b9affee..df7a4ca7a 100644 --- a/sdm/libs/hwc/hwc_session.cpp +++ b/sdm/libs/hwc/hwc_session.cpp @@ -289,7 +289,7 @@ int HWCSession::Prepare(hwc_composer_device_1 *device, size_t num_displays, if (hwc_session->color_mgr_) { HWCDisplay *primary_display = hwc_session->hwc_display_[HWC_DISPLAY_PRIMARY]; - if (primary_display) { + if (primary_display && !hwc_session->is_hdmi_primary_) { int ret = hwc_session->color_mgr_->SolidFillLayersPrepare(displays, primary_display); if (ret) return 0; |