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

Commit 6dc92272 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 am: edfa1f63 

am: db9a2f42

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

Change-Id: I1a341c6ca1b3d36469ac2e2b0f4fd78dbfc697ff
parents c5491bd1 db9a2f42

services/surfaceflinger/SurfaceFlinger.cpp

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

    if (makeAvailable) {

        mHWVsyncAvailable = true;

        mHWVsyncAvailable = true;

    } else if (!mHWVsyncAvailable) {

    } else if (!mHWVsyncAvailable) {

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

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

        // attempt for now

        return;

        return;

    }

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

void SurfaceFlinger::resyncWithRateLimit() {

    static constexpr nsecs_t kIgnoreDelay = ms2ns(500);

    static constexpr nsecs_t kIgnoreDelay = ms2ns(500);

    if (systemTime() - mLastSwapTime > kIgnoreDelay) {

    if (systemTime() - mLastSwapTime > kIgnoreDelay) {

        resyncToHardwareVsync(true);

        resyncToHardwareVsync(false);

    }

    }

}

}

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

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

    if (makeAvailable) {

        mHWVsyncAvailable = true;

        mHWVsyncAvailable = true;

    } else if (!mHWVsyncAvailable) {

    } else if (!mHWVsyncAvailable) {

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

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

        // attempt for now

        return;

        return;

    }

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

void SurfaceFlinger::resyncWithRateLimit() {

    static constexpr nsecs_t kIgnoreDelay = ms2ns(500);

    static constexpr nsecs_t kIgnoreDelay = ms2ns(500);

    if (systemTime() - mLastSwapTime > kIgnoreDelay) {

    if (systemTime() - mLastSwapTime > kIgnoreDelay) {

        resyncToHardwareVsync(true);

        resyncToHardwareVsync(false);

    }

    }

}

}