Merge "Revert "DispSync: workaround HH hardware vsync issue"" into nyc-dev

    mNumResyncSamples = 0;

    mFirstResyncSample = 0;

    mNumResyncSamplesSincePresent = 0;

    mNumPresentWithoutResyncSamples = 0;

    resetErrorLocked();

}

    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;

}

    mModelUpdated = false;

    mNumResyncSamples = 0;

    mNumPresentWithoutResyncSamples = 0;

}

bool DispSync::addResyncSample(nsecs_t timestamp) {

    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.

    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.