summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfeifanz <feifanz@codeaurora.org>2016-06-29 22:19:29 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-06-30 20:30:16 -0700
commit37605f8d2ac27adec17e9e2bb0ccfd09d6e6d70a (patch)
tree5b2933de6709f2c7b39022be7a398dd332f780f7
parent8d7a965614e0b98cd94fd3c602f50dad7605ebce (diff)
downloadhardware_qcom_display-37605f8d2ac27adec17e9e2bb0ccfd09d6e6d70a.tar.gz
hardware_qcom_display-37605f8d2ac27adec17e9e2bb0ccfd09d6e6d70a.tar.bz2
hardware_qcom_display-37605f8d2ac27adec17e9e2bb0ccfd09d6e6d70a.zip
sdm: Remain display framerate after dynamic resolution change
1. Keep HDMI resolution after dynamic frame rate feature switched to or binder set on HDMI device. 2. Disable color manager operations on HDMI device. Change-Id: Ie78b0310ac5212f41bbd46f4f049ecdde623822d
-rw-r--r--sdm/libs/hwc/hwc_display_external.cpp2
-rw-r--r--sdm/libs/hwc/hwc_session.cpp2
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;