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

Commit 758ab618 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Ram Indani
Browse files

Add primary min range check to turn on the kernel idle timer. 

BUG: 191435579
Test: atest RefreshRateConfigsTest
Test: atest SurfaceFlinger_test
Test: atest libsurfaceflinger_unittest

Change-Id: Ibd885a2bed8c889ccc622fb4e7a852a9568309d6
parents 6b903996 0ec77091

services/surfaceflinger/MonitoredProducer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -140,6 +140,11 @@ status_t MonitoredProducer::getLastQueuedBuffer(sp<GraphicBuffer>* outBuffer, 
            outTransformMatrix);

}



status_t MonitoredProducer::getLastQueuedBuffer(sp<GraphicBuffer>* outBuffer, sp<Fence>* outFence,

                                                Rect* outRect, uint32_t* outTransform) {

    return mProducer->getLastQueuedBuffer(outBuffer, outFence, outRect, outTransform);

}



void MonitoredProducer::getFrameTimestamps(FrameEventHistoryDelta* outDelta) {

    mProducer->getFrameTimestamps(outDelta);

}

services/surfaceflinger/MonitoredProducer.h

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ public: 
    virtual status_t setLegacyBufferDrop(bool drop) override;

    virtual status_t getLastQueuedBuffer(sp<GraphicBuffer>* outBuffer,

            sp<Fence>* outFence, float outTransformMatrix[16]) override;

    virtual status_t getLastQueuedBuffer(sp<GraphicBuffer>* outBuffer, sp<Fence>* outFence,

                                         Rect* outRect, uint32_t* outTransform) override;

    virtual IBinder* onAsBinder();

    virtual status_t setSharedBufferMode(bool sharedBufferMode) override;

    virtual status_t setAutoRefresh(bool autoRefresh) override;

services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp

+5 −0
Original line number Diff line number Diff line
@@ -859,6 +859,7 @@ RefreshRateConfigs::KernelIdleTimerAction RefreshRateConfigs::getIdleTimerAction 
    const auto& deviceMin = *mMinSupportedRefreshRate;

    const auto& minByPolicy = getMinRefreshRateByPolicyLocked();

    const auto& maxByPolicy = getMaxRefreshRateByPolicyLocked();

    const auto& currentPolicy = getCurrentPolicyLocked();



    // Kernel idle timer will set the refresh rate to the device min. If DisplayManager says that

    // the min allowed refresh rate is higher than the device min, we do not want to enable the
@@ -867,6 +868,10 @@ RefreshRateConfigs::KernelIdleTimerAction RefreshRateConfigs::getIdleTimerAction 
        return RefreshRateConfigs::KernelIdleTimerAction::TurnOff;

    }

    if (minByPolicy == maxByPolicy) {

        // when min primary range in display manager policy is below device min turn on the timer.

        if (currentPolicy->primaryRange.min.lessThanWithMargin(deviceMin.getFps())) {

            return RefreshRateConfigs::KernelIdleTimerAction::TurnOn;

        }

        return RefreshRateConfigs::KernelIdleTimerAction::TurnOff;

    }

    // Turn on the timer in all other cases.

services/surfaceflinger/Scheduler/RefreshRateConfigs.h

+1 −2
Original line number Diff line number Diff line
@@ -315,8 +315,7 @@ public: 
        return mRefreshRates.size() > 1;

    }



    // Class to enumerate options around toggling the kernel timer on and off. We have an option

    // for no change to avoid extra calls to kernel.

    // Class to enumerate options around toggling the kernel timer on and off.

    enum class KernelIdleTimerAction {

        TurnOff,  // Turn off the idle timer.

        TurnOn    // Turn on the idle timer.

services/surfaceflinger/tests/unittests/RefreshRateConfigsTest.cpp

+29 −0
Original line number Diff line number Diff line
@@ -1908,6 +1908,35 @@ TEST_F(RefreshRateConfigsTest, testKernelIdleTimerAction) { 
    EXPECT_EQ(KernelIdleTimerAction::TurnOff, refreshRateConfigs->getIdleTimerAction());

}



TEST_F(RefreshRateConfigsTest, testKernelIdleTimerActionFor120Hz) {

    using KernelIdleTimerAction = scheduler::RefreshRateConfigs::KernelIdleTimerAction;



    // Tests with 120Hz

    auto refreshRateConfigs =

            std::make_unique<RefreshRateConfigs>(m60_120Device,

                                                 /*currentConfigId=*/HWC_CONFIG_ID_120);

    // SetPolicy(0, 60), current 60Hz => TurnOn.

    ASSERT_GE(refreshRateConfigs->setDisplayManagerPolicy({HWC_CONFIG_ID_60, {Fps(0), Fps(60)}}),

              0);

    EXPECT_EQ(KernelIdleTimerAction::TurnOn, refreshRateConfigs->getIdleTimerAction());



    // SetPolicy(60, 60), current 60Hz => TurnOff.

    ASSERT_GE(refreshRateConfigs->setDisplayManagerPolicy({HWC_CONFIG_ID_60, {Fps(60), Fps(60)}}),

              0);

    EXPECT_EQ(KernelIdleTimerAction::TurnOff, refreshRateConfigs->getIdleTimerAction());



    // SetPolicy(60, 120), current 60Hz => TurnOn.

    ASSERT_GE(refreshRateConfigs->setDisplayManagerPolicy({HWC_CONFIG_ID_60, {Fps(60), Fps(120)}}),

              0);

    EXPECT_EQ(KernelIdleTimerAction::TurnOn, refreshRateConfigs->getIdleTimerAction());



    // SetPolicy(120, 120), current 120Hz => TurnOff.

    ASSERT_GE(refreshRateConfigs->setDisplayManagerPolicy(

                      {HWC_CONFIG_ID_120, {Fps(120), Fps(120)}}),

              0);

    EXPECT_EQ(KernelIdleTimerAction::TurnOff, refreshRateConfigs->getIdleTimerAction());

}



TEST_F(RefreshRateConfigsTest, getFrameRateDivider) {

    auto refreshRateConfigs =

            std::make_unique<RefreshRateConfigs>(m30_60_72_90_120Device,