diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-07-18 19:34:22 -0600 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-07-18 19:34:22 -0600 |
| commit | 145271d28680838fcedfadc57197e359988ba650 (patch) | |
| tree | e67dbf2e70b58ea852fb513456a7c0452268c067 | |
| parent | dc286db30b609a7b35a6cd52d75e2239d29d527c (diff) | |
| parent | 0400de293afeec3d35f4867b421b04d00f2a7bda (diff) | |
| download | hardware_qcom_display-145271d28680838fcedfadc57197e359988ba650.tar.gz hardware_qcom_display-145271d28680838fcedfadc57197e359988ba650.tar.bz2 hardware_qcom_display-145271d28680838fcedfadc57197e359988ba650.zip | |
Promotion of display.lnx.2.0-00043.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1041470 I255c652d81179a9c601343611b2efead0494dc16 sdm: Fix HDMI connect failures while changing the mode
1041470 I7c7a231c0e7cb24cc7ded93bb7db1b4ec8078e96 Revert "sdm: Fix Dynamic frame rate issue"
Change-Id: I714817fc72461e1bca7a8eea57417c1b9c423d66
CRs-Fixed: 1041470
| -rw-r--r-- | sdm/libs/core/fb/hw_hdmi.cpp | 2 | ||||
| -rw-r--r-- | sdm/libs/hwc/hwc_display.cpp | 1 | ||||
| -rw-r--r-- | sdm/libs/hwc/hwc_display_external.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/sdm/libs/core/fb/hw_hdmi.cpp b/sdm/libs/core/fb/hw_hdmi.cpp index ca1bbab72..6fb727197 100644 --- a/sdm/libs/core/fb/hw_hdmi.cpp +++ b/sdm/libs/core/fb/hw_hdmi.cpp @@ -744,7 +744,7 @@ DisplayError HWHDMI::GetDynamicFrameRateMode(uint32_t refresh_rate, uint32_t *mo } } - if (pre_refresh_rate_diff > kThresholdRefreshRate) { + if (abs(pre_refresh_rate_diff) > kThresholdRefreshRate) { return kErrorNotSupported; } diff --git a/sdm/libs/hwc/hwc_display.cpp b/sdm/libs/hwc/hwc_display.cpp index 68562ede8..afae70dcf 100644 --- a/sdm/libs/hwc/hwc_display.cpp +++ b/sdm/libs/hwc/hwc_display.cpp @@ -1172,7 +1172,6 @@ int HWCDisplay::SetFrameBufferResolution(uint32_t x_pixels, uint32_t y_pixels) { framebuffer_config_->vsync_period_ns = active_config.vsync_period_ns; framebuffer_config_->x_dpi = active_config.x_dpi; framebuffer_config_->y_dpi = active_config.y_dpi; - framebuffer_config_->fps = active_config.fps; DLOGI("New framebuffer resolution (%dx%d)", framebuffer_config_->x_pixels, framebuffer_config_->y_pixels); diff --git a/sdm/libs/hwc/hwc_display_external.cpp b/sdm/libs/hwc/hwc_display_external.cpp index 367273851..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 (framebuffer_config_->fps * 1000); + return current_refresh_rate_; } int HWCDisplayExternal::Perform(uint32_t operation, ...) { |