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

Commit 09acbb8c authored by ramindani's avatar ramindani
Browse files

[SF] Add frameIntervalNs for validate command 

BUG: 284845445
Test: Manual
Change-Id: I3cf7a08de5a6cf6621cc013fe6da1a14ace805f6
parent 4aac32c0

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

+4 −2
Original line number Diff line number Diff line
@@ -749,7 +749,8 @@ Error AidlComposer::setClientTargetSlotCount(Display display) { 
}



Error AidlComposer::validateDisplay(Display display, nsecs_t expectedPresentTime,

                                    uint32_t* outNumTypes, uint32_t* outNumRequests) {

                                    int32_t frameIntervalNs, uint32_t* outNumTypes,

                                    uint32_t* outNumRequests) {

    const auto displayId = translate<int64_t>(display);

    ATRACE_FORMAT("HwcValidateDisplay %" PRId64, displayId);
@@ -758,7 +759,8 @@ Error AidlComposer::validateDisplay(Display display, nsecs_t expectedPresentTime 
    auto writer = getWriter(display);

    auto reader = getReader(display);

    if (writer && reader) {

        writer->get().validateDisplay(displayId, ClockMonotonicTimestamp{expectedPresentTime});

        writer->get().validateDisplay(displayId, ClockMonotonicTimestamp{expectedPresentTime},

                                      frameIntervalNs);

        error = execute(display);

    } else {

        error = Error::BAD_DISPLAY;

services/surfaceflinger/DisplayHardware/AidlComposerHal.h

+2 −2
Original line number Diff line number Diff line
@@ -134,8 +134,8 @@ public: 


    Error setClientTargetSlotCount(Display display) override;



    Error validateDisplay(Display display, nsecs_t expectedPresentTime, uint32_t* outNumTypes,

                          uint32_t* outNumRequests) override;

    Error validateDisplay(Display display, nsecs_t expectedPresentTime, int32_t frameIntervalNs,

                          uint32_t* outNumTypes, uint32_t* outNumRequests) override;



    Error presentOrValidateDisplay(Display display, nsecs_t expectedPresentTime,

                                   int32_t frameIntervalNs, uint32_t* outNumTypes,

services/surfaceflinger/DisplayHardware/ComposerHal.h

+2 −1
Original line number Diff line number Diff line
@@ -174,7 +174,8 @@ public: 
    virtual Error setClientTargetSlotCount(Display display) = 0;



    virtual Error validateDisplay(Display display, nsecs_t expectedPresentTime,

                                  uint32_t* outNumTypes, uint32_t* outNumRequests) = 0;

                                  int32_t frameIntervalNs, uint32_t* outNumTypes,

                                  uint32_t* outNumRequests) = 0;



    virtual Error presentOrValidateDisplay(Display display, nsecs_t expectedPresentTime,

                                           int32_t frameIntervalNs, uint32_t* outNumTypes,

services/surfaceflinger/DisplayHardware/HWC2.cpp

+3 −2
Original line number Diff line number Diff line
@@ -517,11 +517,12 @@ Error Display::setVsyncEnabled(Vsync enabled) 
    return static_cast<Error>(intError);

}



Error Display::validate(nsecs_t expectedPresentTime, uint32_t* outNumTypes,

Error Display::validate(nsecs_t expectedPresentTime, int32_t frameIntervalNs, uint32_t* outNumTypes,

                        uint32_t* outNumRequests) {

    uint32_t numTypes = 0;

    uint32_t numRequests = 0;

    auto intError = mComposer.validateDisplay(mId, expectedPresentTime, &numTypes, &numRequests);

    auto intError = mComposer.validateDisplay(mId, expectedPresentTime, frameIntervalNs, &numTypes,

                                              &numRequests);

    auto error = static_cast<Error>(intError);

    if (error != Error::NONE && !hasChangesError(error)) {

        return error;

services/surfaceflinger/DisplayHardware/HWC2.h

+3 −3
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ public: 
            const android::sp<android::Fence>& releaseFence) = 0;

    [[nodiscard]] virtual hal::Error setPowerMode(hal::PowerMode mode) = 0;

    [[nodiscard]] virtual hal::Error setVsyncEnabled(hal::Vsync enabled) = 0;

    [[nodiscard]] virtual hal::Error validate(nsecs_t expectedPresentTime, uint32_t* outNumTypes,

                                              uint32_t* outNumRequests) = 0;

    [[nodiscard]] virtual hal::Error validate(nsecs_t expectedPresentTime, int32_t frameIntervalNs,

                                              uint32_t* outNumTypes, uint32_t* outNumRequests) = 0;

    [[nodiscard]] virtual hal::Error presentOrValidate(nsecs_t expectedPresentTime,

                                                       int32_t frameIntervalNs,

                                                       uint32_t* outNumTypes,
@@ -234,7 +234,7 @@ public: 
                               const android::sp<android::Fence>& releaseFence) override;

    hal::Error setPowerMode(hal::PowerMode) override;

    hal::Error setVsyncEnabled(hal::Vsync enabled) override;

    hal::Error validate(nsecs_t expectedPresentTime, uint32_t* outNumTypes,

    hal::Error validate(nsecs_t expectedPresentTime, int32_t frameIntervalNs, uint32_t* outNumTypes,

                        uint32_t* outNumRequests) override;

    hal::Error presentOrValidate(nsecs_t expectedPresentTime, int32_t frameIntervalNs,

                                 uint32_t* outNumTypes, uint32_t* outNumRequests,