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

Commit acf2c6dd authored by Chia-I Wu's avatar Chia-I Wu Committed by Android (Google) Code Review
Browse files

Merge "Revert "surfaceflinger: work around dumpsys lockup"" into oc-dev

parents cd436833 15b27e0e

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+1 −12
Original line number Original line Diff line number Diff line
@@ -69,8 +69,7 @@ HWComposer::HWComposer(bool useVrComposer) 
      mCBContext(),

      mCBContext(),

      mEventHandler(nullptr),

      mEventHandler(nullptr),

      mVSyncCounts(),

      mVSyncCounts(),

      mRemainingHwcVirtualDisplays(0),

      mRemainingHwcVirtualDisplays(0)

      mDumpMayLockUp(false)

{

{

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

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

        mLastHwVSync[i] = 0;

        mLastHwVSync[i] = 0;
@@ -494,8 +493,6 @@ status_t HWComposer::prepare(DisplayDevice& displayDevice) { 
        return NO_ERROR;

        return NO_ERROR;

    }

    }





    mDumpMayLockUp = true;



    uint32_t numTypes = 0;

    uint32_t numTypes = 0;

    uint32_t numRequests = 0;

    uint32_t numRequests = 0;

    auto error = hwcDisplay->validate(&numTypes, &numRequests);

    auto error = hwcDisplay->validate(&numTypes, &numRequests);
@@ -636,9 +633,6 @@ status_t HWComposer::presentAndGetReleaseFences(int32_t displayId) { 
    auto& displayData = mDisplayData[displayId];

    auto& displayData = mDisplayData[displayId];

    auto& hwcDisplay = displayData.hwcDisplay;

    auto& hwcDisplay = displayData.hwcDisplay;

    auto error = hwcDisplay->present(&displayData.lastPresentFence);

    auto error = hwcDisplay->present(&displayData.lastPresentFence);



    mDumpMayLockUp = false;



    if (error != HWC2::Error::None) {

    if (error != HWC2::Error::None) {

        ALOGE("presentAndGetReleaseFences: failed for display %d: %s (%d)",

        ALOGE("presentAndGetReleaseFences: failed for display %d: %s (%d)",

              displayId, to_string(error).c_str(), static_cast<int32_t>(error));

              displayId, to_string(error).c_str(), static_cast<int32_t>(error));
@@ -884,11 +878,6 @@ bool HWComposer::isUsingVrComposer() const { 
}

}





void HWComposer::dump(String8& result) const {

void HWComposer::dump(String8& result) const {

    if (mDumpMayLockUp) {

        result.append("HWComposer dump skipped because present in progress");

        return;

    }



    // TODO: In order to provide a dump equivalent to HWC1, we need to shadow

    // TODO: In order to provide a dump equivalent to HWC1, we need to shadow

    // all the state going into the layers. This is probably better done in

    // all the state going into the layers. This is probably better done in

    // Layer itself, but it's going to take a bit of work to get there.

    // Layer itself, but it's going to take a bit of work to get there.

services/surfaceflinger/DisplayHardware/HWComposer.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -224,9 +224,6 @@ private: 




    // thread-safe

    // thread-safe

    mutable Mutex mVsyncLock;

    mutable Mutex mVsyncLock;



    // XXX temporary workaround for b/35806047

    mutable std::atomic<bool> mDumpMayLockUp;

};

};





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

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