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

Commit 41bf7c63 authored by Ady Abraham's avatar Ady Abraham
Browse files

SF: fix a bug when render frame rate range is lower then supported 

Ideally DisplayManager should know what is the min supported frame rate
that SF allows, and send the policy accordingly. This is a more elaborate
fix that will be coming as part of b/292105422. For now we fix it in SF
by just ignoring the render frame rate when we can't find any frame rate
that is allowed by the policy.

Bug: 292047939
Bug: 291172084
Test: atest android.graphics.cts.FrameRateOverrideTest
Change-Id: Id053a07eec2525ecbe1156ad46f649956a06a03b
parent 33a386ba

services/surfaceflinger/Scheduler/RefreshRateSelector.cpp

+12 −3
Original line number Original line Diff line number Diff line
@@ -1223,10 +1223,19 @@ void RefreshRateSelector::constructAvailableRefreshRates() { 
                    (supportsFrameRateOverride() || ranges.render.includes(mode.getFps()));

                    (supportsFrameRateOverride() || ranges.render.includes(mode.getFps()));

        };

        };





        const auto frameRateModes = createFrameRateModes(filterModes, ranges.render);

        auto frameRateModes = createFrameRateModes(filterModes, ranges.render);

        LOG_ALWAYS_FATAL_IF(frameRateModes.empty(),

        if (frameRateModes.empty()) {

                            "No matching frame rate modes for %s range. policy: %s", rangeName,

            ALOGW("No matching frame rate modes for %s range. policy: %s", rangeName,

                  policy->toString().c_str());

                  policy->toString().c_str());

            // TODO(b/292105422): Ideally DisplayManager should not send render ranges smaller than

            // the min supported. See b/292047939.

            //  For not we just ignore the render ranges.

            frameRateModes = createFrameRateModes(filterModes, {});

        }

        LOG_ALWAYS_FATAL_IF(frameRateModes.empty(),

                            "No matching frame rate modes for %s range even after ignoring the "

                            "render range. policy: %s",

                            rangeName, policy->toString().c_str());





        const auto stringifyModes = [&] {

        const auto stringifyModes = [&] {

            std::string str;

            std::string str;

services/surfaceflinger/tests/unittests/RefreshRateSelectorTest.cpp

+15 −0
Original line number Original line Diff line number Diff line
@@ -3042,5 +3042,20 @@ TEST_P(RefreshRateSelectorTest, frameRateNotInRange) { 
    EXPECT_FRAME_RATE_MODE(kMode60, 60_Hz, selector.getBestScoredFrameRate(layers).frameRateMode);

    EXPECT_FRAME_RATE_MODE(kMode60, 60_Hz, selector.getBestScoredFrameRate(layers).frameRateMode);

}

}





TEST_P(RefreshRateSelectorTest, frameRateIsLowerThanMinSupported) {

    if (GetParam() != Config::FrameRateOverride::Enabled) {

        return;

    }



    auto selector = createSelector(kModes_60_90, kModeId60);



    constexpr Fps kMin = RefreshRateSelector::kMinSupportedFrameRate;

    constexpr FpsRanges kLowerThanMin = {{60_Hz, 90_Hz}, {kMin / 2, kMin / 2}};



    EXPECT_EQ(SetPolicyResult::Changed,

              selector.setDisplayManagerPolicy(

                      {DisplayModeId(kModeId60), kLowerThanMin, kLowerThanMin}));

}



} // namespace

} // namespace

} // namespace android::scheduler
 
} // namespace android::scheduler