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

Commit 1aaec304 authored by Ram Indani's avatar Ram Indani Committed by Android (Google) Code Review
Browse files

Merge "[SF] Updates to incorporate vrr aidl interface changes" into main

parents 6d8c1c79 263a3f1f

services/surfaceflinger/CompositionEngine/tests/MockHWComposer.h

+2 −1
Original line number Diff line number Diff line
@@ -94,7 +94,8 @@ public: 
    MOCK_METHOD(std::optional<PhysicalDisplayId>, onVsync, (hal::HWDisplayId, int64_t));

    MOCK_METHOD2(setVsyncEnabled, void(PhysicalDisplayId, hal::Vsync));

    MOCK_CONST_METHOD1(isConnected, bool(PhysicalDisplayId));

    MOCK_CONST_METHOD1(getModes, std::vector<HWComposer::HWCDisplayMode>(PhysicalDisplayId));

    MOCK_CONST_METHOD2(getModes,

                       std::vector<HWComposer::HWCDisplayMode>(PhysicalDisplayId, int32_t));

    MOCK_CONST_METHOD1(getActiveMode, std::optional<hal::HWConfigId>(PhysicalDisplayId));

    MOCK_CONST_METHOD1(getColorModes, std::vector<ui::ColorMode>(PhysicalDisplayId));

    MOCK_METHOD3(setActiveColorMode, status_t(PhysicalDisplayId, ui::ColorMode, ui::RenderIntent));

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

+3 −2
Original line number Diff line number Diff line
@@ -492,10 +492,11 @@ Error AidlComposer::getDisplayConfigs(Display display, std::vector<Config>* outC 
    return Error::NONE;

}



Error AidlComposer::getDisplayConfigurations(Display display,

Error AidlComposer::getDisplayConfigurations(Display display, int32_t maxFrameIntervalNs,

                                             std::vector<DisplayConfiguration>* outConfigs) {

    const auto status =

            mAidlComposerClient->getDisplayConfigurations(translate<int64_t>(display), outConfigs);

            mAidlComposerClient->getDisplayConfigurations(translate<int64_t>(display),

                                                          maxFrameIntervalNs, outConfigs);

    if (!status.isOk()) {

        ALOGE("getDisplayConfigurations failed %s", status.getDescription().c_str());

        return static_cast<Error>(status.getServiceSpecificError());

services/surfaceflinger/DisplayHardware/AidlComposerHal.h

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ public: 
    Error getDisplayAttribute(Display display, Config config, IComposerClient::Attribute attribute,

                              int32_t* outValue) override;

    Error getDisplayConfigs(Display display, std::vector<Config>* outConfigs);

    Error getDisplayConfigurations(Display, std::vector<DisplayConfiguration>*);

    Error getDisplayConfigurations(Display, int32_t maxFrameIntervalNs,

                                   std::vector<DisplayConfiguration>*);

    Error getDisplayName(Display display, std::string* outName) override;



    Error getDisplayRequests(Display display, uint32_t* outDisplayRequestMask,

services/surfaceflinger/DisplayHardware/ComposerHal.h

+2 −1
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ public: 
                                      IComposerClient::Attribute attribute, int32_t* outValue) = 0;

    virtual Error getDisplayConfigs(Display display, std::vector<Config>* outConfigs) = 0;



    virtual Error getDisplayConfigurations(Display, std::vector<DisplayConfiguration>*) = 0;

    virtual Error getDisplayConfigurations(Display, int32_t maxFrameIntervalNs,

                                           std::vector<DisplayConfiguration>*) = 0;



    virtual Error getDisplayName(Display display, std::string* outName) = 0;

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+6 −5
Original line number Diff line number Diff line
@@ -261,23 +261,24 @@ bool HWComposer::isConnected(PhysicalDisplayId displayId) const { 
    return mDisplayData.count(displayId) && mDisplayData.at(displayId).hwcDisplay->isConnected();

}



std::vector<HWComposer::HWCDisplayMode> HWComposer::getModes(PhysicalDisplayId displayId) const {

std::vector<HWComposer::HWCDisplayMode> HWComposer::getModes(PhysicalDisplayId displayId,

                                                             int32_t maxFrameIntervalNs) const {

    RETURN_IF_INVALID_DISPLAY(displayId, {});



    const auto hwcDisplayId = mDisplayData.at(displayId).hwcDisplay->getId();



    if (mComposer->getDisplayConfigurationsSupported()) {

        return getModesFromDisplayConfigurations(hwcDisplayId);

        return getModesFromDisplayConfigurations(hwcDisplayId, maxFrameIntervalNs);

    }



    return getModesFromLegacyDisplayConfigs(hwcDisplayId);

}



std::vector<HWComposer::HWCDisplayMode> HWComposer::getModesFromDisplayConfigurations(

        uint64_t hwcDisplayId) const {

        uint64_t hwcDisplayId, int32_t maxFrameIntervalNs) const {

    std::vector<hal::DisplayConfiguration> configs;

    auto error =

            static_cast<hal::Error>(mComposer->getDisplayConfigurations(hwcDisplayId, &configs));

    auto error = static_cast<hal::Error>(

            mComposer->getDisplayConfigurations(hwcDisplayId, maxFrameIntervalNs, &configs));

    RETURN_IF_HWC_ERROR_FOR("getDisplayConfigurations", error, *toPhysicalDisplayId(hwcDisplayId),

                            {});