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

Commit 12c9e5af authored by Marin Shalamanov's avatar Marin Shalamanov
Browse files

SF: Add DisplayDevice::initiateModeChange 

This CL creates DisplayDevice::initiateModeChange which calls
HWC::setActiveConfigWithConstraints. SF should call DisplayDevice
instead of directly calling HWComposer.
This is a step towards removing the cached display modes from
the HWComposer class.

Test: presubmit
Bug: 159590486
Change-Id: Id05d2eacbbb6ed335fe205231b85e8af9a8ccd91
parent 5801c949

services/surfaceflinger/CompositionEngine/tests/MockHWComposer.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public: 
    MOCK_CONST_METHOD1(isVsyncPeriodSwitchSupported, bool(PhysicalDisplayId));

    MOCK_CONST_METHOD1(getDisplayVsyncPeriod, nsecs_t(PhysicalDisplayId));

    MOCK_METHOD4(setActiveModeWithConstraints,

                 status_t(PhysicalDisplayId, DisplayModeId,

                 status_t(PhysicalDisplayId, hal::HWConfigId,

                          const hal::VsyncPeriodChangeConstraints&,

                          hal::VsyncPeriodChangeTimeline*));

    MOCK_METHOD2(setAutoLowLatencyMode, status_t(PhysicalDisplayId, bool));

services/surfaceflinger/DisplayDevice.cpp

+19 −2
Original line number Diff line number Diff line
@@ -51,12 +51,16 @@ using android::base::StringAppendF; 
ui::Transform::RotationFlags DisplayDevice::sPrimaryDisplayRotationFlags = ui::Transform::ROT_0;



DisplayDeviceCreationArgs::DisplayDeviceCreationArgs(

        const sp<SurfaceFlinger>& flinger, const wp<IBinder>& displayToken,

        const sp<SurfaceFlinger>& flinger, HWComposer& hwComposer, const wp<IBinder>& displayToken,

        std::shared_ptr<compositionengine::Display> compositionDisplay)

      : flinger(flinger), displayToken(displayToken), compositionDisplay(compositionDisplay) {}

      : flinger(flinger),

        hwComposer(hwComposer),

        displayToken(displayToken),

        compositionDisplay(compositionDisplay) {}



DisplayDevice::DisplayDevice(DisplayDeviceCreationArgs& args)

      : mFlinger(args.flinger),

        mHwComposer(args.hwComposer),

        mDisplayToken(args.displayToken),

        mSequenceId(args.sequenceId),

        mConnectionType(args.connectionType),
@@ -146,6 +150,19 @@ void DisplayDevice::setActiveMode(DisplayModeId id) { 
    mActiveModeId = id;

}



status_t DisplayDevice::initiateModeChange(DisplayModeId modeId,

                                           const hal::VsyncPeriodChangeConstraints& constraints,

                                           hal::VsyncPeriodChangeTimeline* outTimeline) const {

    const auto mode = getMode(modeId);

    if (!mode) {

        ALOGE("Trying to initiate a mode change to invalid mode %s on display %s",

              std::to_string(modeId.value()).c_str(), to_string(getId()).c_str());

        return BAD_VALUE;

    }

    return mHwComposer.setActiveModeWithConstraints(getPhysicalId(), mode->getHwcId(), constraints,

                                                    outTimeline);

}



const DisplayModePtr& DisplayDevice::getActiveMode() const {

    return mSupportedModes[mActiveModeId.value()];

}

services/surfaceflinger/DisplayDevice.h

+8 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <ui/HdrCapabilities.h>

#include <ui/Region.h>

#include <ui/Transform.h>

#include <utils/Errors.h>

#include <utils/Mutex.h>

#include <utils/RefBase.h>

#include <utils/Timers.h>
@@ -161,6 +162,9 @@ public: 
     */

    const DisplayModePtr& getActiveMode() const;

    void setActiveMode(DisplayModeId);

    status_t initiateModeChange(DisplayModeId modeId,

                                const hal::VsyncPeriodChangeConstraints& constraints,

                                hal::VsyncPeriodChangeTimeline* outTimeline) const;



    // Return the immutable list of supported display modes. The HWC may report different modes

    // after a hotplug reconnect event, in which case the DisplayDevice object will be recreated.
@@ -184,6 +188,7 @@ public: 


private:

    const sp<SurfaceFlinger> mFlinger;

    HWComposer& mHwComposer;

    const wp<IBinder> mDisplayToken;

    const int32_t mSequenceId;

    const std::optional<DisplayConnectionType> mConnectionType;
@@ -240,9 +245,11 @@ private: 
struct DisplayDeviceCreationArgs {

    // We use a constructor to ensure some of the values are set, without

    // assuming a default value.

    DisplayDeviceCreationArgs(const sp<SurfaceFlinger>&, const wp<IBinder>& displayToken,

    DisplayDeviceCreationArgs(const sp<SurfaceFlinger>&, HWComposer& hwComposer,

                              const wp<IBinder>& displayToken,

                              std::shared_ptr<compositionengine::Display>);

    const sp<SurfaceFlinger> flinger;

    HWComposer& hwComposer;

    const wp<IBinder> displayToken;

    const std::shared_ptr<compositionengine::Display> compositionDisplay;

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+4 −10
Original line number Diff line number Diff line
@@ -674,19 +674,13 @@ status_t HWComposer::setPowerMode(PhysicalDisplayId displayId, hal::PowerMode mo 
}



status_t HWComposer::setActiveModeWithConstraints(

        PhysicalDisplayId displayId, DisplayModeId modeId,

        PhysicalDisplayId displayId, hal::HWConfigId hwcModeId,

        const hal::VsyncPeriodChangeConstraints& constraints,

        hal::VsyncPeriodChangeTimeline* outTimeline) {

    RETURN_IF_INVALID_DISPLAY(displayId, BAD_INDEX);



    auto& displayData = mDisplayData[displayId];

    if (modeId.value() >= displayData.modes.size()) {

        LOG_DISPLAY_ERROR(displayId, ("Invalid mode " + std::to_string(modeId.value())).c_str());

        return BAD_INDEX;

    }



    const auto hwcConfigId = displayData.modes[modeId.value()]->getHwcId();

    auto error = displayData.hwcDisplay->setActiveConfigWithConstraints(hwcConfigId, constraints,

    auto error = mDisplayData[displayId].hwcDisplay->setActiveConfigWithConstraints(hwcModeId,

                                                                                    constraints,

                                                                                    outTimeline);

    RETURN_IF_HWC_ERROR(error, displayId, UNKNOWN_ERROR);

    return NO_ERROR;

services/surfaceflinger/DisplayHardware/HWComposer.h

+2 −2
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ public: 
    virtual DisplayConnectionType getDisplayConnectionType(PhysicalDisplayId) const = 0;

    virtual bool isVsyncPeriodSwitchSupported(PhysicalDisplayId) const = 0;

    virtual nsecs_t getDisplayVsyncPeriod(PhysicalDisplayId) const = 0;

    virtual status_t setActiveModeWithConstraints(PhysicalDisplayId, DisplayModeId,

    virtual status_t setActiveModeWithConstraints(PhysicalDisplayId, hal::HWConfigId,

                                                  const hal::VsyncPeriodChangeConstraints&,

                                                  hal::VsyncPeriodChangeTimeline* outTimeline) = 0;

    virtual status_t setAutoLowLatencyMode(PhysicalDisplayId, bool on) = 0;
@@ -329,7 +329,7 @@ public: 
    DisplayConnectionType getDisplayConnectionType(PhysicalDisplayId) const override;

    bool isVsyncPeriodSwitchSupported(PhysicalDisplayId) const override;

    nsecs_t getDisplayVsyncPeriod(PhysicalDisplayId displayId) const override;

    status_t setActiveModeWithConstraints(PhysicalDisplayId, DisplayModeId,

    status_t setActiveModeWithConstraints(PhysicalDisplayId, hal::HWConfigId,

                                          const hal::VsyncPeriodChangeConstraints&,

                                          hal::VsyncPeriodChangeTimeline* outTimeline) override;

    status_t setAutoLowLatencyMode(PhysicalDisplayId, bool) override;