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

Commit b93edb77 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SF: add composer optional features"

parents 2f510e6b 4d211cf5

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

+7 −0
Original line number Diff line number Diff line
@@ -253,6 +253,13 @@ AidlComposer::AidlComposer(const std::string& serviceName) { 


AidlComposer::~AidlComposer() = default;



bool AidlComposer::isSupported(OptionalFeature feature) const {

    switch (feature) {

        case OptionalFeature::RefreshRateSwitching:

            return true;

    }

}



std::vector<IComposer::Capability> AidlComposer::getCapabilities() {

    std::vector<Capability> capabilities;

    const auto status = mAidlComposer->getCapabilities(&capabilities);

services/surfaceflinger/DisplayHardware/AidlComposerHal.h

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ public: 
    explicit AidlComposer(const std::string& serviceName);

    ~AidlComposer() override;



    bool isSupported(OptionalFeature) const;



    std::vector<IComposer::Capability> getCapabilities() override;

    std::string dumpDebugInfo() override;
@@ -178,7 +180,6 @@ public: 
    Error setDisplayBrightness(Display display, float brightness) override;



    // Composer HAL 2.4

    bool isVsyncPeriodSwitchSupported() override { return true; }

    Error getDisplayCapabilities(Display display,

                                 std::vector<DisplayCapability>* outCapabilities) override;

    V2_4::Error getDisplayConnectionType(Display display,

services/surfaceflinger/DisplayHardware/ComposerHal.h

+6 −1
Original line number Diff line number Diff line
@@ -75,6 +75,12 @@ public: 


    virtual ~Composer() = 0;



    enum class OptionalFeature {

        RefreshRateSwitching,

    };



    virtual bool isSupported(OptionalFeature) const = 0;



    virtual std::vector<IComposer::Capability> getCapabilities() = 0;

    virtual std::string dumpDebugInfo() = 0;
@@ -200,7 +206,6 @@ public: 
    virtual Error setDisplayBrightness(Display display, float brightness) = 0;



    // Composer HAL 2.4

    virtual bool isVsyncPeriodSwitchSupported() = 0;

    virtual Error getDisplayCapabilities(Display display,

                                         std::vector<DisplayCapability>* outCapabilities) = 0;

    virtual V2_4::Error getDisplayConnectionType(

services/surfaceflinger/DisplayHardware/HWC2.cpp

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ void Display::onLayerDestroyed(hal::HWLayerId layerId) { 
bool Display::isVsyncPeriodSwitchSupported() const {

    ALOGV("[%" PRIu64 "] isVsyncPeriodSwitchSupported()", mId);



    return mComposer.isVsyncPeriodSwitchSupported();

    return mComposer.isSupported(android::Hwc2::Composer::OptionalFeature::RefreshRateSwitching);

}



Error Display::getChangedCompositionTypes(std::unordered_map<HWC2::Layer*, Composition>* outTypes) {

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -159,8 +159,10 @@ void HWComposer::setCallback(HWC2::ComposerCallback* callback) { 
    }

    mRegisteredCallback = true;



    const bool vsyncSwitchingSupported =

            mComposer->isSupported(Hwc2::Composer::OptionalFeature::RefreshRateSwitching);

    mComposer->registerCallback(

            sp<ComposerCallbackBridge>::make(callback, mComposer->isVsyncPeriodSwitchSupported()));

            sp<ComposerCallbackBridge>::make(callback, vsyncSwitchingSupported));

}



bool HWComposer::getDisplayIdentificationData(hal::HWDisplayId hwcDisplayId, uint8_t* outPort,