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

Commit bef42c50 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

handle several vsync signal correctly 

Change-Id: I34935d2197ce8e914fef2f110896e47b44225ad2
parent 0f288fcc

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+16 −6
Original line number Diff line number Diff line
@@ -87,12 +87,17 @@ HWComposer::HWComposer( 
      mFbDev(0), mHwc(0), mNumDisplays(1),

      mCBContext(new cb_context),

      mEventHandler(handler),

      mVSyncCount(0), mDebugForceFakeVSync(false)

      mDebugForceFakeVSync(false)

{

    for (size_t i =0 ; i<MAX_HWC_DISPLAYS ; i++) {

        mLists[i] = 0;

    }



    for (size_t i=0 ; i<HWC_NUM_PHYSICAL_DISPLAY_TYPES ; i++) {

        mLastHwVSync[i] = 0;

        mVSyncCounts[i] = 0;

    }



    char value[PROPERTY_VALUE_MAX];

    property_get("debug.sf.no_hw_vsync", value, "0");

    mDebugForceFakeVSync = atoi(value);
@@ -278,10 +283,15 @@ void HWComposer::invalidate() { 
}



void HWComposer::vsync(int disp, int64_t timestamp) {

    ATRACE_INT("VSYNC", ++mVSyncCount&1);

    if (uint32_t(disp) < HWC_NUM_PHYSICAL_DISPLAY_TYPES) {

        char tag[16];

        snprintf(tag, sizeof(tag), "VSYNC_%1u", disp);

        ATRACE_INT(tag, ++mVSyncCounts[disp] & 1);



        mEventHandler.onVSyncReceived(disp, timestamp);

        Mutex::Autolock _l(mLock);

    mLastHwVSync = timestamp;

        mLastHwVSync[disp] = timestamp;

    }

}



void HWComposer::hotplug(int disp, int connected) {
@@ -415,7 +425,7 @@ nsecs_t HWComposer::getRefreshTimestamp(int disp) const { 
    // the refresh period and whatever closest timestamp we have.

    Mutex::Autolock _l(mLock);

    nsecs_t now = systemTime(CLOCK_MONOTONIC);

    return now - ((now - mLastHwVSync) %  mDisplayData[disp].refresh);

    return now - ((now - mLastHwVSync[disp]) %  mDisplayData[disp].refresh);

}



sp<Fence> HWComposer::getDisplayFence(int disp) const {

services/surfaceflinger/DisplayHardware/HWComposer.h

+2 −2
Original line number Diff line number Diff line
@@ -342,14 +342,14 @@ private: 


    cb_context*                     mCBContext;

    EventHandler&                   mEventHandler;

    size_t                          mVSyncCount;

    size_t                          mVSyncCounts[HWC_NUM_PHYSICAL_DISPLAY_TYPES];

    sp<VSyncThread>                 mVSyncThread;

    bool                            mDebugForceFakeVSync;

    BitSet32                        mAllocatedDisplayIDs;



    // protected by mLock

    mutable Mutex mLock;

    mutable nsecs_t mLastHwVSync;

    mutable nsecs_t mLastHwVSync[HWC_NUM_PHYSICAL_DISPLAY_TYPES];



    // thread-safe

    mutable Mutex mEventControlLock;