From 5a2c41d40ee3293bcea3d95688d17e90e41b4b50 Mon Sep 17 00:00:00 2001 From: Ramkumar Radhakrishnan Date: Wed, 13 Jul 2016 20:39:58 -0700 Subject: Revert "sdm: Fix Dynamic frame rate issue" This reverts commit e3a33533f158201cc825923d2f1ac73ddee6fbad. CRs-Fixed: 1041470 Change-Id: I7c7a231c0e7cb24cc7ded93bb7db1b4ec8078e96 --- sdm/libs/hwc/hwc_display.cpp | 1 - sdm/libs/hwc/hwc_display_external.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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, ...) { -- cgit v1.2.3 From 0400de293afeec3d35f4867b421b04d00f2a7bda Mon Sep 17 00:00:00 2001 From: Ramkumar Radhakrishnan Date: Wed, 13 Jul 2016 22:34:43 -0700 Subject: sdm: Fix HDMI connect failures while changing the mode Fix HDMI connect failures while changing the mode with lower fps to the mode with higher fps. Change-Id: I255c652d81179a9c601343611b2efead0494dc16 CRs-Fixed: 1041470 --- sdm/libs/core/fb/hw_hdmi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- cgit v1.2.3