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

Commit bbfbe93c authored by Jamie Gennis's avatar Jamie Gennis Committed by Android Git Automerger
Browse files

am 0a645cc5: SurfaceFlinger: give SF its own vsync phase 

* commit '0a645cc5':
  SurfaceFlinger: give SF its own vsync phase
parents 47c772e8 0a645cc5

services/surfaceflinger/Android.mk

+7 −0
Original line number Diff line number Diff line
@@ -66,6 +66,13 @@ else 
    LOCAL_CFLAGS += -DVSYNC_EVENT_PHASE_OFFSET_NS=0

endif



# See build/target/board/generic/BoardConfig.mk for a description of this setting.

ifneq ($(SF_VSYNC_EVENT_PHASE_OFFSET_NS),)

    LOCAL_CFLAGS += -DSF_VSYNC_EVENT_PHASE_OFFSET_NS=$(SF_VSYNC_EVENT_PHASE_OFFSET_NS)

else

    LOCAL_CFLAGS += -DSF_VSYNC_EVENT_PHASE_OFFSET_NS=0

endif



ifneq ($(PRESENT_TIME_OFFSET_FROM_VSYNC_NS),)

    LOCAL_CFLAGS += -DPRESENT_TIME_OFFSET_FROM_VSYNC_NS=$(PRESENT_TIME_OFFSET_FROM_VSYNC_NS)

else

services/surfaceflinger/SurfaceFlinger.cpp

+22 −6
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ static const bool runningWithoutSyncFramework = false; 
// conservatively (or at least with awareness of the trade-off being made).

static const int64_t vsyncPhaseOffsetNs = VSYNC_EVENT_PHASE_OFFSET_NS;



// This is the phase offset at which SurfaceFlinger's composition runs.

static const int64_t sfVsyncPhaseOffsetNs = SF_VSYNC_EVENT_PHASE_OFFSET_NS;



// ---------------------------------------------------------------------------



const String16 sHardwareTest("android.permission.HARDWARE_TEST");
@@ -439,7 +442,11 @@ status_t SurfaceFlinger::selectEGLConfig(EGLDisplay display, EGLint nativeVisual 


class DispSyncSource : public VSyncSource, private DispSync::Callback {

public:

    DispSyncSource(DispSync* dispSync) : mValue(0), mDispSync(dispSync) {}

    DispSyncSource(DispSync* dispSync, nsecs_t phaseOffset, bool traceVsync) :

            mValue(0),

            mPhaseOffset(phaseOffset),

            mTraceVsync(traceVsync),

            mDispSync(dispSync) {}



    virtual ~DispSyncSource() {}
@@ -447,7 +454,7 @@ public: 
        // Do NOT lock the mutex here so as to avoid any mutex ordering issues

        // with locking it in the onDispSyncEvent callback.

        if (enable) {

            status_t err = mDispSync->addEventListener(vsyncPhaseOffsetNs,

            status_t err = mDispSync->addEventListener(mPhaseOffset,

                    static_cast<DispSync::Callback*>(this));

            if (err != NO_ERROR) {

                ALOGE("error registering vsync callback: %s (%d)",
@@ -477,9 +484,11 @@ private: 
            Mutex::Autolock lock(mMutex);

            callback = mCallback;



            if (mTraceVsync) {

                mValue = (mValue + 1) % 2;

                ATRACE_INT("VSYNC", mValue);

            }

        }



        if (callback != NULL) {

            callback->onVSyncEvent(when);
@@ -488,6 +497,9 @@ private: 


    int mValue;



    const nsecs_t mPhaseOffset;

    const bool mTraceVsync;



    DispSync* mDispSync;

    sp<VSyncSource::Callback> mCallback;

    Mutex mMutex;
@@ -589,9 +601,13 @@ void SurfaceFlinger::init() { 
    getDefaultDisplayDevice()->makeCurrent(mEGLDisplay, mEGLContext);



    // start the EventThread

    sp<VSyncSource> vsyncSrc = new DispSyncSource(&mPrimaryDispSync);

    sp<VSyncSource> vsyncSrc = new DispSyncSource(&mPrimaryDispSync,

            vsyncPhaseOffsetNs, true);

    mEventThread = new EventThread(vsyncSrc);

    mEventQueue.setEventThread(mEventThread);

    sp<VSyncSource> sfVsyncSrc = new DispSyncSource(&mPrimaryDispSync,

            sfVsyncPhaseOffsetNs, false);

    mSFEventThread = new EventThread(sfVsyncSrc);

    mEventQueue.setEventThread(mSFEventThread);



    mEventControlThread = new EventControlThread(this);

    mEventControlThread->run("EventControl", PRIORITY_URGENT_DISPLAY);

services/surfaceflinger/SurfaceFlinger.h

+1 −0
Original line number Diff line number Diff line
@@ -428,6 +428,7 @@ private: 
    nsecs_t mBootTime;

    bool mGpuToCpuSupported;

    sp<EventThread> mEventThread;

    sp<EventThread> mSFEventThread;

    sp<EventControlThread> mEventControlThread;

    EGLContext mEGLContext;

    EGLConfig mEGLConfig;