Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edfa1f63 authored by Dan Stoza's avatar Dan Stoza Committed by android-build-merger
Browse files

Merge "DispSync: Don\'t resync if HW vsync is unavailable" into nyc-dev 

am: 15732be8

* commit '15732be8':
  DispSync: Don't resync if HW vsync is unavailable

Change-Id: Ifc1ece90ebafe3d984e089b6aeffa9fd03c3fcef
parents 0aa4eaff 15732be8

services/surfaceflinger/SurfaceFlinger.cpp

+3 −2
Original line number Diff line number Diff line
@@ -800,7 +800,8 @@ void SurfaceFlinger::resyncToHardwareVsync(bool makeAvailable) { 
    if (makeAvailable) {

        mHWVsyncAvailable = true;

    } else if (!mHWVsyncAvailable) {

        ALOGE("resyncToHardwareVsync called when HW vsync unavailable");

        // Hardware vsync is not currently available, so abort the resync

        // attempt for now

        return;

    }
@@ -834,7 +835,7 @@ void SurfaceFlinger::disableHardwareVsync(bool makeUnavailable) { 
void SurfaceFlinger::resyncWithRateLimit() {

    static constexpr nsecs_t kIgnoreDelay = ms2ns(500);

    if (systemTime() - mLastSwapTime > kIgnoreDelay) {

        resyncToHardwareVsync(true);

        resyncToHardwareVsync(false);

    }

}

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

+3 −2
Original line number Diff line number Diff line
@@ -820,7 +820,8 @@ void SurfaceFlinger::resyncToHardwareVsync(bool makeAvailable) { 
    if (makeAvailable) {

        mHWVsyncAvailable = true;

    } else if (!mHWVsyncAvailable) {

        ALOGE("resyncToHardwareVsync called when HW vsync unavailable");

        // Hardware vsync is not currently available, so abort the resync

        // attempt for now

        return;

    }
@@ -854,7 +855,7 @@ void SurfaceFlinger::disableHardwareVsync(bool makeUnavailable) { 
void SurfaceFlinger::resyncWithRateLimit() {

    static constexpr nsecs_t kIgnoreDelay = ms2ns(500);

    if (systemTime() - mLastSwapTime > kIgnoreDelay) {

        resyncToHardwareVsync(true);

        resyncToHardwareVsync(false);

    }

}