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

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

Merge "Templatize MQDescriptor and rename to fmq_sync/fmq_unsync"

parents cd921549 33351dae

benchmarks/msgq/1.0/IBenchmarkMsgQ.hal

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ interface IBenchmarkMsgQ { 
     * by the service. Client can use it to set up the FMQ at its end.

     */

    configureClientInboxSyncReadWrite()

        generates(bool ret, MQDescriptorSync mqDescIn);

        generates(bool ret, fmq_sync<uint8_t> mqDescIn);



    /*

     * This method requests the service to set up Synchronous read/write
@@ -35,7 +35,7 @@ interface IBenchmarkMsgQ { 
     * by the service. Client can use it to set up the FMQ at its end.

     */

    configureClientOutboxSyncReadWrite()

        generates(bool ret, MQDescriptorSync mqDescOut);

        generates(bool ret, fmq_sync<uint8_t> mqDescOut);



    /*

     * This method request the service to write into the FMQ.

graphics/composer/2.1/IComposerClient.hal

+2 −2
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ interface IComposerClient { 
     * @return error is NONE upon success. Otherwise,

     *         NO_RESOURCES when failed to set the queue temporarily.

     */

    setInputCommandQueue(MQDescriptorSync descriptor)

    setInputCommandQueue(fmq_sync<uint32_t> descriptor)

              generates (Error error);



    /*
@@ -568,7 +568,7 @@ interface IComposerClient { 
     */

    getOutputCommandQueue()

              generates (Error error,

                         MQDescriptorSync descriptor);

                         fmq_sync<uint32_t> descriptor);



    /*

     * Executes commands from the input command message queue. Return values

graphics/composer/2.1/default/HwcClient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ Return<Error> HwcClient::setVsyncEnabled(Display display, Vsync enabled) 
}



Return<Error> HwcClient::setInputCommandQueue(

        const MQDescriptorSync& descriptor)

        const MQDescriptorSync<uint32_t>& descriptor)

{

    std::lock_guard<std::mutex> lock(mCommandMutex);

    return mReader.setMQDescriptor(descriptor) ?
@@ -514,7 +514,7 @@ Return<void> HwcClient::getOutputCommandQueue( 
    if (outDescriptor) {

        hidl_cb(Error::NONE, *outDescriptor);

    } else {

        hidl_cb(Error::NO_RESOURCES, MQDescriptorSync(0, nullptr, 0));

        hidl_cb(Error::NO_RESOURCES, MQDescriptorSync<uint32_t>());

    }



    return Void();

graphics/composer/2.1/default/HwcClient.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public: 
    Return<Error> setClientTargetSlotCount(Display display,

            uint32_t clientTargetSlotCount) override;

    Return<Error> setInputCommandQueue(

            const MQDescriptorSync& descriptor) override;

            const MQDescriptorSync<uint32_t>& descriptor) override;

    Return<void> getOutputCommandQueue(

            getOutputCommandQueue_cb hidl_cb) override;

    Return<void> executeCommands(uint32_t inLength,

graphics/composer/2.1/default/IComposerCommandBuffer.h

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public: 
        return true;

    }



    const MQDescriptorSync* getMQDescriptor() const

    const MQDescriptorSync<uint32_t>* getMQDescriptor() const

    {

        return (mQueue) ? mQueue->getDesc() : nullptr;

    }
@@ -626,7 +626,7 @@ public: 
        reset();

    }



    bool setMQDescriptor(const MQDescriptorSync& descriptor)

    bool setMQDescriptor(const MQDescriptorSync<uint32_t>& descriptor)

    {

        mQueue = std::make_unique<CommandQueueType>(descriptor, false);

        if (mQueue->isValid()) {