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

Commit 1c69cd36 authored by linpeter's avatar linpeter
Browse files

Allow first power mode as off state 

Bug: 237745199
test: atest libsurfaceflinger_unittest:OnInitializeDisplaysTest
      atest libsurfaceflinger_unittest:SetPowerModeInternalTest
Change-Id: I3a2eae4efc4a5c6113700a9ca9e9b261e364a878
parent 5b9a2716

services/surfaceflinger/DisplayDevice.cpp

+7 −5
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ DisplayDevice::DisplayDevice(DisplayDeviceCreationArgs& args) 


    mCompositionDisplay->getRenderSurface()->initialize();



    setPowerMode(args.initialPowerMode);

    if (args.initialPowerMode.has_value()) setPowerMode(args.initialPowerMode.value());



    // initialize the display orientation transform.

    setProjection(ui::ROTATION_0, Rect::INVALID_RECT, Rect::INVALID_RECT);
@@ -170,19 +170,21 @@ auto DisplayDevice::getInputInfo() const -> InputInfo { 


void DisplayDevice::setPowerMode(hal::PowerMode mode) {

    mPowerMode = mode;

    getCompositionDisplay()->setCompositionEnabled(mPowerMode != hal::PowerMode::OFF);



    getCompositionDisplay()->setCompositionEnabled(mPowerMode.has_value() &&

                                                   *mPowerMode != hal::PowerMode::OFF);

}



void DisplayDevice::enableLayerCaching(bool enable) {

    getCompositionDisplay()->setLayerCachingEnabled(enable);

}



hal::PowerMode DisplayDevice::getPowerMode() const {

std::optional<hal::PowerMode> DisplayDevice::getPowerMode() const {

    return mPowerMode;

}



bool DisplayDevice::isPoweredOn() const {

    return mPowerMode != hal::PowerMode::OFF;

    return mPowerMode && *mPowerMode != hal::PowerMode::OFF;

}



void DisplayDevice::setActiveMode(DisplayModeId id) {
@@ -369,7 +371,7 @@ void DisplayDevice::dump(std::string& result) const { 
    }



    result += "\n   powerMode="s;

    result += to_string(mPowerMode);

    result += mPowerMode.has_value() ? to_string(mPowerMode.value()) : "OFF(reset)";

    result += '\n';



    if (mRefreshRateConfigs) {

services/surfaceflinger/DisplayDevice.h

+4 −5
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ public: 
    /* ------------------------------------------------------------------------

     * Display power mode management.

     */

    hardware::graphics::composer::hal::PowerMode getPowerMode() const;

    std::optional<hardware::graphics::composer::hal::PowerMode> getPowerMode() const;

    void setPowerMode(hardware::graphics::composer::hal::PowerMode mode);

    bool isPoweredOn() const;
@@ -280,8 +280,8 @@ private: 


    static ui::Transform::RotationFlags sPrimaryDisplayRotationFlags;



    hardware::graphics::composer::hal::PowerMode mPowerMode =

            hardware::graphics::composer::hal::PowerMode::OFF;

    // allow initial power mode as null.

    std::optional<hardware::graphics::composer::hal::PowerMode> mPowerMode;

    DisplayModePtr mActiveMode;

    std::optional<float> mStagedBrightness = std::nullopt;

    float mBrightness = -1.f;
@@ -365,8 +365,7 @@ struct DisplayDeviceCreationArgs { 
    HdrCapabilities hdrCapabilities;

    int32_t supportedPerFrameMetadata{0};

    std::unordered_map<ui::ColorMode, std::vector<ui::RenderIntent>> hwcColorModes;

    hardware::graphics::composer::hal::PowerMode initialPowerMode{

            hardware::graphics::composer::hal::PowerMode::ON};

    std::optional<hardware::graphics::composer::hal::PowerMode> initialPowerMode;

    bool isPrimary{false};

    DisplayModes supportedModes;

    DisplayModeId activeModeId;

services/surfaceflinger/SurfaceFlinger.cpp

+7 −6
Original line number Diff line number Diff line
@@ -2793,7 +2793,8 @@ sp<DisplayDevice> SurfaceFlinger::setupNewDisplayDeviceInternal( 
    ALOGV("Display Orientation: %s", toCString(creationArgs.physicalOrientation));



    // virtual displays are always considered enabled

    creationArgs.initialPowerMode = state.isVirtual() ? hal::PowerMode::ON : hal::PowerMode::OFF;

    creationArgs.initialPowerMode =

            state.isVirtual() ? std::make_optional(hal::PowerMode::ON) : std::nullopt;



    sp<DisplayDevice> display = getFactory().createDisplayDevice(creationArgs);
@@ -4712,8 +4713,8 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& display, hal: 
    const auto displayId = display->getPhysicalId();

    ALOGD("Setting power mode %d on display %s", mode, to_string(displayId).c_str());



    const hal::PowerMode currentMode = display->getPowerMode();

    if (mode == currentMode) {

    std::optional<hal::PowerMode> currentMode = display->getPowerMode();

    if (currentMode.has_value() && mode == *currentMode) {

        return;

    }
@@ -4729,7 +4730,7 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& display, hal: 
        mInterceptor->savePowerModeUpdate(display->getSequenceId(), static_cast<int32_t>(mode));

    }

    const auto refreshRate = display->refreshRateConfigs().getActiveMode()->getFps();

    if (currentMode == hal::PowerMode::OFF) {

    if (*currentMode == hal::PowerMode::OFF) {

        // Turn on the display

        if (display->isInternal() && (!activeDisplay || !activeDisplay->isPoweredOn())) {

            onActiveDisplayChangedLocked(display);
@@ -4759,7 +4760,7 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& display, hal: 
        if (SurfaceFlinger::setSchedAttr(false) != NO_ERROR) {

            ALOGW("Couldn't set uclamp.min on display off: %s\n", strerror(errno));

        }

        if (isDisplayActiveLocked(display) && currentMode != hal::PowerMode::DOZE_SUSPEND) {

        if (isDisplayActiveLocked(display) && *currentMode != hal::PowerMode::DOZE_SUSPEND) {

            mScheduler->disableHardwareVsync(true);

            mScheduler->onScreenReleased(mAppConnectionHandle);

        }
@@ -4773,7 +4774,7 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& display, hal: 
    } else if (mode == hal::PowerMode::DOZE || mode == hal::PowerMode::ON) {

        // Update display while dozing

        getHwComposer().setPowerMode(displayId, mode);

        if (isDisplayActiveLocked(display) && currentMode == hal::PowerMode::DOZE_SUSPEND) {

        if (isDisplayActiveLocked(display) && *currentMode == hal::PowerMode::DOZE_SUSPEND) {

            ALOGI("Force repainting for DOZE_SUSPEND -> DOZE or ON.");

            mVisibleRegionsDirty = true;

            scheduleRepaint();

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

+1 −0
Original line number Diff line number Diff line
@@ -728,6 +728,7 @@ public: 
                mHwcDisplayId(hwcDisplayId) {

            mCreationArgs.connectionType = connectionType;

            mCreationArgs.isPrimary = isPrimary;

            mCreationArgs.initialPowerMode = hal::PowerMode::ON;

        }



        sp<IBinder> token() const { return mDisplayToken; }