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

Commit 22279c44 authored by Dan Stoza's avatar Dan Stoza
Browse files

Revert "DispSync: workaround HH hardware vsync issue" 

This reverts commit c734d95c, which was
a workaround for a bug on a device which is now obsolete.

Bug: 25845510
Change-Id: I3244bfd3f758c52dfe76e9d5b0a72bbcffdf5a6f
parent 7c357a75

services/surfaceflinger/DispSync.cpp

+0 −11
Original line number Diff line number Diff line
@@ -322,7 +322,6 @@ void DispSync::reset() { 
    mNumResyncSamples = 0;

    mFirstResyncSample = 0;

    mNumResyncSamplesSincePresent = 0;

    mNumPresentWithoutResyncSamples = 0;

    resetErrorLocked();

}
@@ -347,15 +346,6 @@ bool DispSync::addPresentFence(const sp<Fence>& fence) { 


    updateErrorLocked();



    // This is a workaround for b/25845510.

    // If we have no resync samples after many presents, something is wrong with

    // HW vsync. Tell SF to disable HW vsync now and re-enable it next time.

    if (mNumResyncSamples == 0 &&

        mNumPresentWithoutResyncSamples++ > MAX_PRESENT_WITHOUT_RESYNC_SAMPLES) {

        mNumPresentWithoutResyncSamples = 0;

        return false;

    }



    return !mModelUpdated || mError > kErrorThreshold;

}
@@ -364,7 +354,6 @@ void DispSync::beginResync() { 


    mModelUpdated = false;

    mNumResyncSamples = 0;

    mNumPresentWithoutResyncSamples = 0;

}



bool DispSync::addResyncSample(nsecs_t timestamp) {

services/surfaceflinger/DispSync.h

+0 −2
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ private: 
    enum { MIN_RESYNC_SAMPLES_FOR_UPDATE = 3 };

    enum { NUM_PRESENT_SAMPLES = 8 };

    enum { MAX_RESYNC_SAMPLES_WITHOUT_PRESENT = 4 };

    enum { MAX_PRESENT_WITHOUT_RESYNC_SAMPLES = 8 };



    // mPeriod is the computed period of the modeled vsync events in

    // nanoseconds.
@@ -169,7 +168,6 @@ private: 
    size_t mFirstResyncSample;

    size_t mNumResyncSamples;

    int mNumResyncSamplesSincePresent;

    int mNumPresentWithoutResyncSamples;



    // These member variables store information about the present fences used

    // to validate the currently computed model.