diff options
author | Dan Stoza | 2016-04-19 15:45:55 -0500 |
---|---|---|
committer | android-build-merger | 2016-04-19 15:45:55 -0500 |
commit | edfa1f63855a9c6e006c1cb24b284756baad6f1c (patch) | |
tree | 164aa498e27ea9c359c478013d69f2f8735a8483 | |
parent | 0aa4eaffa0e33c27abe04ec5a8f099a9c29dfd76 (diff) | |
parent | 15732be8aaa961a8eeb50a2cd3db76981ff2e83f (diff) | |
download | frameworks-native-edfa1f63855a9c6e006c1cb24b284756baad6f1c.tar.gz frameworks-native-edfa1f63855a9c6e006c1cb24b284756baad6f1c.tar.xz frameworks-native-edfa1f63855a9c6e006c1cb24b284756baad6f1c.zip |
Merge "DispSync: Don\'t resync if HW vsync is unavailable" into nyc-dev
am: 15732be
* commit '15732be8aaa961a8eeb50a2cd3db76981ff2e83f':
DispSync: Don't resync if HW vsync is unavailable
Change-Id: Ifc1ece90ebafe3d984e089b6aeffa9fd03c3fcef
-rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 5 | ||||
-rw-r--r-- | services/surfaceflinger/SurfaceFlinger_hwc1.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index c09920cd2..a69b11b0c 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp | |||
@@ -800,7 +800,8 @@ void SurfaceFlinger::resyncToHardwareVsync(bool makeAvailable) { | |||
800 | if (makeAvailable) { | 800 | if (makeAvailable) { |
801 | mHWVsyncAvailable = true; | 801 | mHWVsyncAvailable = true; |
802 | } else if (!mHWVsyncAvailable) { | 802 | } else if (!mHWVsyncAvailable) { |
803 | ALOGE("resyncToHardwareVsync called when HW vsync unavailable"); | 803 | // Hardware vsync is not currently available, so abort the resync |
804 | // attempt for now | ||
804 | return; | 805 | return; |
805 | } | 806 | } |
806 | 807 | ||
@@ -834,7 +835,7 @@ void SurfaceFlinger::disableHardwareVsync(bool makeUnavailable) { | |||
834 | void SurfaceFlinger::resyncWithRateLimit() { | 835 | void SurfaceFlinger::resyncWithRateLimit() { |
835 | static constexpr nsecs_t kIgnoreDelay = ms2ns(500); | 836 | static constexpr nsecs_t kIgnoreDelay = ms2ns(500); |
836 | if (systemTime() - mLastSwapTime > kIgnoreDelay) { | 837 | if (systemTime() - mLastSwapTime > kIgnoreDelay) { |
837 | resyncToHardwareVsync(true); | 838 | resyncToHardwareVsync(false); |
838 | } | 839 | } |
839 | } | 840 | } |
840 | 841 | ||
diff --git a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp index b0115988e..00700ab59 100644 --- a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp +++ b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp | |||
@@ -820,7 +820,8 @@ void SurfaceFlinger::resyncToHardwareVsync(bool makeAvailable) { | |||
820 | if (makeAvailable) { | 820 | if (makeAvailable) { |
821 | mHWVsyncAvailable = true; | 821 | mHWVsyncAvailable = true; |
822 | } else if (!mHWVsyncAvailable) { | 822 | } else if (!mHWVsyncAvailable) { |
823 | ALOGE("resyncToHardwareVsync called when HW vsync unavailable"); | 823 | // Hardware vsync is not currently available, so abort the resync |
824 | // attempt for now | ||
824 | return; | 825 | return; |
825 | } | 826 | } |
826 | 827 | ||
@@ -854,7 +855,7 @@ void SurfaceFlinger::disableHardwareVsync(bool makeUnavailable) { | |||
854 | void SurfaceFlinger::resyncWithRateLimit() { | 855 | void SurfaceFlinger::resyncWithRateLimit() { |
855 | static constexpr nsecs_t kIgnoreDelay = ms2ns(500); | 856 | static constexpr nsecs_t kIgnoreDelay = ms2ns(500); |
856 | if (systemTime() - mLastSwapTime > kIgnoreDelay) { | 857 | if (systemTime() - mLastSwapTime > kIgnoreDelay) { |
857 | resyncToHardwareVsync(true); | 858 | resyncToHardwareVsync(false); |
858 | } | 859 | } |
859 | } | 860 | } |
860 | 861 | ||