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

Commit e3f66681 authored by Dominik Laskowski's avatar Dominik Laskowski Committed by Android (Google) Code Review
Browse files

Merge changes Ibe39de0f,I6c4b1abe into main 

* changes:
  SF: Deduplicate ID concat of DisplayDevice traces
  SF: Remove ALOGV spam
parents 0648e7ba 0784adc1

services/surfaceflinger/DisplayDevice.cpp

+5 −4
Original line number Diff line number Diff line
@@ -63,13 +63,14 @@ DisplayDevice::DisplayDevice(DisplayDeviceCreationArgs& args) 
        mDisplayToken(args.displayToken),

        mSequenceId(args.sequenceId),

        mCompositionDisplay{args.compositionDisplay},

        mActiveModeFPSTrace("ActiveModeFPS -" + to_string(getId())),

        mActiveModeFPSHwcTrace("ActiveModeFPS_HWC -" + to_string(getId())),

        mRenderFrameRateFPSTrace("RenderRateFPS -" + to_string(getId())),

        mActiveModeFPSTrace(concatId("ActiveModeFPS")),

        mActiveModeFPSHwcTrace(concatId("ActiveModeFPS_HWC")),

        mRenderFrameRateFPSTrace(concatId("RenderRateFPS")),

        mPhysicalOrientation(args.physicalOrientation),

        mIsPrimary(args.isPrimary),

        mRequestedRefreshRate(args.requestedRefreshRate),

        mRefreshRateSelector(std::move(args.refreshRateSelector)) {

        mRefreshRateSelector(std::move(args.refreshRateSelector)),

        mDesiredActiveModeChanged(concatId("DesiredActiveModeChanged"), false) {

    mCompositionDisplay->editState().isSecure = args.isSecure;

    mCompositionDisplay->createRenderSurface(

            compositionengine::RenderSurfaceCreationArgsBuilder()

services/surfaceflinger/DisplayDevice.h

+6 −2
Original line number Diff line number Diff line
@@ -269,6 +269,11 @@ public: 
    void dump(utils::Dumper&) const;



private:

    template <size_t N>

    inline std::string concatId(const char (&str)[N]) const {

        return std::string(ftl::Concat(str, ' ', getId().value).str());

    }



    const sp<SurfaceFlinger> mFlinger;

    HWComposer& mHwComposer;

    const wp<IBinder> mDisplayToken;
@@ -316,8 +321,7 @@ private: 


    mutable std::mutex mActiveModeLock;

    ActiveModeInfo mDesiredActiveMode GUARDED_BY(mActiveModeLock);

    TracedOrdinal<bool> mDesiredActiveModeChanged GUARDED_BY(mActiveModeLock) =

            {ftl::Concat("DesiredActiveModeChanged-", getId().value).c_str(), false};

    TracedOrdinal<bool> mDesiredActiveModeChanged GUARDED_BY(mActiveModeLock);



    ActiveModeInfo mUpcomingActiveMode GUARDED_BY(kMainThreadContext);

    bool mIsModeSetPending GUARDED_BY(kMainThreadContext) = false;

services/surfaceflinger/SurfaceFlinger.cpp

+0 −2
Original line number Diff line number Diff line
@@ -2922,7 +2922,6 @@ void SurfaceFlinger::onCompositionPresented(PhysicalDisplayId pacesetterId, 
                                            const scheduler::FrameTargeters& frameTargeters,

                                            nsecs_t presentStartTime) {

    ATRACE_CALL();

    ALOGV(__func__);



    ui::PhysicalDisplayMap<PhysicalDisplayId, std::shared_ptr<FenceTime>> presentFences;

    ui::PhysicalDisplayMap<PhysicalDisplayId, const sp<Fence>> gpuCompositionDoneFences;
@@ -3810,7 +3809,6 @@ void SurfaceFlinger::commitTransactionsLocked(uint32_t transactionFlags) { 
                // first frame before the display is available, we rely

                // on WMS and DMS to provide the right information

                // so the client can calculate the hint.

                ALOGV("Skipping reporting transform hint update for %s", layer->getDebugName());

                layer->skipReportingTransformHint();

            } else {

                layer->updateTransformHint(hintDisplay->getTransformHint());