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

Commit 3569f1fe authored by Dan Stoza's avatar Dan Stoza Committed by android-build-merger
Browse files

Merge \"HWC2: Add properties to revert latching changes\" into nyc-mr1-dev 

am: d16f6ae2

Change-Id: I27f8bd2c5e3756ffa809dfeed4887ea849e4eb3c
parents 19cd2f88 d16f6ae2

services/surfaceflinger/Layer.cpp

+20 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 


#include "RenderEngine/RenderEngine.h"



#include <mutex>



#define DEBUG_RESIZE    0



namespace android {
@@ -1089,6 +1091,20 @@ uint32_t Layer::getProducerStickyTransform() const { 
    return static_cast<uint32_t>(producerStickyTransform);

}



bool Layer::latchUnsignaledBuffers() {

    static bool propertyLoaded = false;

    static bool latch = false;

    static std::mutex mutex;

    std::lock_guard<std::mutex> lock(mutex);

    if (!propertyLoaded) {

        char value[PROPERTY_VALUE_MAX] = {};

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

        latch = atoi(value);

        propertyLoaded = true;

    }

    return latch;

}



uint64_t Layer::getHeadFrameNumber() const {

    Mutex::Autolock lock(mQueueItemLock);

    if (!mQueueItems.empty()) {
@@ -1100,6 +1116,10 @@ uint64_t Layer::getHeadFrameNumber() const { 


bool Layer::headFenceHasSignaled() const {

#ifdef USE_HWC2

    if (latchUnsignaledBuffers()) {

        return true;

    }



    Mutex::Autolock lock(mQueueItemLock);

    if (mQueueItems.empty()) {

        return true;

services/surfaceflinger/Layer.h

+3 −0
Original line number Diff line number Diff line
@@ -465,6 +465,9 @@ private: 
    // Temporary - Used only for LEGACY camera mode.

    uint32_t getProducerStickyTransform() const;



    // Loads the corresponding system property once per process

    static bool latchUnsignaledBuffers();



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



    class SyncPoint

services/surfaceflinger/SurfaceFlinger.cpp

+5 −1
Original line number Diff line number Diff line
@@ -192,6 +192,10 @@ SurfaceFlinger::SurfaceFlinger() 
    }

    ALOGI_IF(mDebugRegion, "showupdates enabled");

    ALOGI_IF(mDebugDDMS, "DDMS debugging enabled");



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

    mPropagateBackpressure = !atoi(value);

    ALOGI_IF(!mPropagateBackpressure, "Disabling backpressure propagation");

}



void SurfaceFlinger::onFirstRef()
@@ -1022,7 +1026,7 @@ void SurfaceFlinger::onMessageReceived(int32_t what) { 
                    mPreviousPresentFence != Fence::NO_FENCE &&

                    mPreviousPresentFence->getSignalTime() == INT64_MAX;

            ATRACE_INT("FrameMissed", static_cast<int>(frameMissed));

            if (frameMissed) {

            if (mPropagateBackpressure && frameMissed) {

                signalLayerUpdate();

                break;

            }

services/surfaceflinger/SurfaceFlinger.h

+3 −0
Original line number Diff line number Diff line
@@ -526,6 +526,9 @@ private: 
    bool mBootFinished;

    bool mForceFullDamage;

    FenceTracker mFenceTracker;

#ifdef USE_HWC2

    bool mPropagateBackpressure = true;

#endif



    // these are thread safe

    mutable MessageQueue mEventQueue;