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

Commit e7385f74 authored by Ady Abraham's avatar Ady Abraham
Browse files

SF: use AIDL composer 

Open and use the new AIDL composer if supported by the device

Bug: 198690444
Test: Build

Change-Id: I190170913b2adc980a23b0916817b74777be7c81
parent cc3784bf

libs/vr/libvrflinger/Android.bp

+5 −1
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ staticLibraries = [ 
    "libbroadcastring",

    "libbroadcastring",

    "libvr_manager",

    "libvr_manager",

    "libbroadcastring",

    "libbroadcastring",

    "libaidlcommonsupport",

]

]





sharedLibraries = [

sharedLibraries = [
@@ -50,7 +51,9 @@ sharedLibraries = [ 
    "android.hardware.graphics.composer@2.2",

    "android.hardware.graphics.composer@2.2",

    "android.hardware.graphics.composer@2.3",

    "android.hardware.graphics.composer@2.3",

    "android.hardware.graphics.composer@2.4",

    "android.hardware.graphics.composer@2.4",

    "android.hardware.graphics.composer3-V1-ndk",

    "libbinder",

    "libbinder",

    "libbinder_ndk",

    "libbase",

    "libbase",

    "libbufferhubqueue",

    "libbufferhubqueue",

    "libcutils",

    "libcutils",
@@ -76,6 +79,7 @@ headerLibraries = [ 
    "android.hardware.graphics.composer@2.2-command-buffer",

    "android.hardware.graphics.composer@2.2-command-buffer",

    "android.hardware.graphics.composer@2.3-command-buffer",

    "android.hardware.graphics.composer@2.3-command-buffer",

    "android.hardware.graphics.composer@2.4-command-buffer",

    "android.hardware.graphics.composer@2.4-command-buffer",

    "android.hardware.graphics.composer3-command-buffer",

    "libdvr_headers",

    "libdvr_headers",

    "libsurfaceflinger_headers",

    "libsurfaceflinger_headers",

]

]

services/surfaceflinger/Android.bp

+9 −0
Original line number Original line Diff line number Diff line
@@ -39,15 +39,19 @@ cc_defaults { 
        "android.hardware.graphics.allocator@2.0",

        "android.hardware.graphics.allocator@2.0",

        "android.hardware.graphics.allocator@3.0",

        "android.hardware.graphics.allocator@3.0",

        "android.hardware.graphics.common@1.2",

        "android.hardware.graphics.common@1.2",

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "android.hardware.graphics.composer@2.1",

        "android.hardware.graphics.composer@2.1",

        "android.hardware.graphics.composer@2.2",

        "android.hardware.graphics.composer@2.2",

        "android.hardware.graphics.composer@2.3",

        "android.hardware.graphics.composer@2.3",

        "android.hardware.graphics.composer@2.4",

        "android.hardware.graphics.composer@2.4",

        "android.hardware.graphics.composer3-V1-ndk",

        "android.hardware.power@1.0",

        "android.hardware.power@1.0",

        "android.hardware.power@1.3",

        "android.hardware.power@1.3",

        "android.hardware.power-V2-cpp",

        "android.hardware.power-V2-cpp",

        "libbase",

        "libbase",

        "libbinder",

        "libbinder",

        "libbinder_ndk",

        "libcutils",

        "libcutils",

        "libEGL",

        "libEGL",

        "libfmq",

        "libfmq",
@@ -69,18 +73,21 @@ cc_defaults { 
        "server_configurable_flags",

        "server_configurable_flags",

    ],

    ],

    static_libs: [

    static_libs: [

        "libaidlcommonsupport",

        "libcompositionengine",

        "libcompositionengine",

        "libframetimeline",

        "libframetimeline",

        "libperfetto_client_experimental",

        "libperfetto_client_experimental",

        "librenderengine",

        "librenderengine",

        "libserviceutils",

        "libserviceutils",

        "libtrace_proto",

        "libtrace_proto",

        "libaidlcommonsupport",

    ],

    ],

    header_libs: [

    header_libs: [

        "android.hardware.graphics.composer@2.1-command-buffer",

        "android.hardware.graphics.composer@2.1-command-buffer",

        "android.hardware.graphics.composer@2.2-command-buffer",

        "android.hardware.graphics.composer@2.2-command-buffer",

        "android.hardware.graphics.composer@2.3-command-buffer",

        "android.hardware.graphics.composer@2.3-command-buffer",

        "android.hardware.graphics.composer@2.4-command-buffer",

        "android.hardware.graphics.composer@2.4-command-buffer",

        "android.hardware.graphics.composer3-command-buffer",

    ],

    ],

    export_static_lib_headers: [

    export_static_lib_headers: [

        "libcompositionengine",

        "libcompositionengine",
@@ -95,6 +102,7 @@ cc_defaults { 
        "android.hardware.graphics.composer@2.2",

        "android.hardware.graphics.composer@2.2",

        "android.hardware.graphics.composer@2.3",

        "android.hardware.graphics.composer@2.3",

        "android.hardware.graphics.composer@2.4",

        "android.hardware.graphics.composer@2.4",

        "android.hardware.graphics.composer3-V1-ndk",

        "android.hardware.power@1.3",

        "android.hardware.power@1.3",

        "libhidlbase",

        "libhidlbase",

        "libtimestats",

        "libtimestats",
@@ -144,6 +152,7 @@ filegroup { 
        "EffectLayer.cpp",

        "EffectLayer.cpp",

        "ContainerLayer.cpp",

        "ContainerLayer.cpp",

        "DisplayDevice.cpp",

        "DisplayDevice.cpp",

        "DisplayHardware/AidlComposerHal.cpp",

        "DisplayHardware/ComposerHal.cpp",

        "DisplayHardware/ComposerHal.cpp",

        "DisplayHardware/DisplayIdentification.cpp",

        "DisplayHardware/DisplayIdentification.cpp",

        "DisplayHardware/FramebufferSurface.cpp",

        "DisplayHardware/FramebufferSurface.cpp",

services/surfaceflinger/CompositionEngine/Android.bp

+3 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ cc_defaults { 
        "android.hardware.graphics.composer@2.2",

        "android.hardware.graphics.composer@2.2",

        "android.hardware.graphics.composer@2.3",

        "android.hardware.graphics.composer@2.3",

        "android.hardware.graphics.composer@2.4",

        "android.hardware.graphics.composer@2.4",

        "android.hardware.graphics.composer3-V1-ndk",

        "android.hardware.power@1.0",

        "android.hardware.power@1.0",

        "android.hardware.power@1.3",

        "android.hardware.power@1.3",

        "libbase",

        "libbase",
@@ -38,12 +39,14 @@ cc_defaults { 
        "libmath",

        "libmath",

        "librenderengine",

        "librenderengine",

        "libtrace_proto",

        "libtrace_proto",

        "libaidlcommonsupport",

    ],

    ],

    header_libs: [

    header_libs: [

        "android.hardware.graphics.composer@2.1-command-buffer",

        "android.hardware.graphics.composer@2.1-command-buffer",

        "android.hardware.graphics.composer@2.2-command-buffer",

        "android.hardware.graphics.composer@2.2-command-buffer",

        "android.hardware.graphics.composer@2.3-command-buffer",

        "android.hardware.graphics.composer@2.3-command-buffer",

        "android.hardware.graphics.composer@2.4-command-buffer",

        "android.hardware.graphics.composer@2.4-command-buffer",

        "android.hardware.graphics.composer3-command-buffer",

        "libsurfaceflinger_headers",

        "libsurfaceflinger_headers",

    ],

    ],

}

}

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

0 → 100644
+1366 −0

File added.

Preview size limit exceeded, changes collapsed.

services/surfaceflinger/DisplayHardware/ComposerHal.h

+276 −1
Original line number Original line Diff line number Diff line
@@ -29,9 +29,13 @@ 
#pragma clang diagnostic ignored "-Wconversion"

#pragma clang diagnostic ignored "-Wconversion"

#pragma clang diagnostic ignored "-Wextra"

#pragma clang diagnostic ignored "-Wextra"





#include <android/hardware/graphics/common/1.1/types.h>

#include <android/hardware/graphics/composer/2.4/IComposer.h>

#include <android/hardware/graphics/composer/2.4/IComposer.h>

#include <android/hardware/graphics/composer/2.4/IComposerClient.h>

#include <android/hardware/graphics/composer/2.4/IComposerClient.h>



#include <aidl/android/hardware/graphics/composer3/IComposer.h>

#include <aidl/android/hardware/graphics/composer3/IComposerClient.h>

#include <android/hardware/graphics/composer3/command-buffer.h>



#include <composer-command-buffer/2.4/ComposerCommandBuffer.h>

#include <composer-command-buffer/2.4/ComposerCommandBuffer.h>

#include <gui/BufferQueue.h>

#include <gui/BufferQueue.h>

#include <gui/HdrMetadata.h>

#include <gui/HdrMetadata.h>
@@ -78,6 +82,11 @@ using PerFrameMetadata = IComposerClient::PerFrameMetadata; 
using PerFrameMetadataKey = IComposerClient::PerFrameMetadataKey;

using PerFrameMetadataKey = IComposerClient::PerFrameMetadataKey;

using PerFrameMetadataBlob = IComposerClient::PerFrameMetadataBlob;

using PerFrameMetadataBlob = IComposerClient::PerFrameMetadataBlob;





using AidlCommandWriterBase = aidl::android::hardware::graphics::composer3::CommandWriterBase;

using AidlCommandReaderBase = aidl::android::hardware::graphics::composer3::CommandReaderBase;



class AidlIComposerCallbackWrapper;



class Composer {

class Composer {

public:

public:

    virtual ~Composer() = 0;

    virtual ~Composer() = 0;
@@ -322,6 +331,92 @@ private: 
    ReturnData* mCurrentReturnData;

    ReturnData* mCurrentReturnData;

};

};





class AidlCommandReader : public AidlCommandReaderBase {

public:

    ~AidlCommandReader();



    // Parse and execute commands from the command queue.  The commands are

    // actually return values from the server and will be saved in ReturnData.

    int parse();



    // Get and clear saved errors.

    struct CommandError {

        uint32_t location;

        Error error;

    };

    std::vector<CommandError> takeErrors();



    bool hasChanges(Display display, uint32_t* outNumChangedCompositionTypes,

                    uint32_t* outNumLayerRequestMasks) const;



    // Get and clear saved changed composition types.

    void takeChangedCompositionTypes(Display display, std::vector<Layer>* outLayers,

                                     std::vector<IComposerClient::Composition>* outTypes);



    // Get and clear saved display requests.

    void takeDisplayRequests(Display display, uint32_t* outDisplayRequestMask,

                             std::vector<Layer>* outLayers,

                             std::vector<uint32_t>* outLayerRequestMasks);



    // Get and clear saved release fences.

    void takeReleaseFences(Display display, std::vector<Layer>* outLayers,

                           std::vector<int>* outReleaseFences);



    // Get and clear saved present fence.

    void takePresentFence(Display display, int* outPresentFence);



    // Get what stage succeeded during PresentOrValidate: Present or Validate

    void takePresentOrValidateStage(Display display, uint32_t* state);



    // Get the client target properties requested by hardware composer.

    void takeClientTargetProperty(Display display,

                                  IComposerClient::ClientTargetProperty* outClientTargetProperty);



private:

    void resetData();



    bool parseSelectDisplay(uint16_t length);

    bool parseSetError(uint16_t length);

    bool parseSetChangedCompositionTypes(uint16_t length);

    bool parseSetDisplayRequests(uint16_t length);

    bool parseSetPresentFence(uint16_t length);

    bool parseSetReleaseFences(uint16_t length);

    bool parseSetPresentOrValidateDisplayResult(uint16_t length);

    bool parseSetClientTargetProperty(uint16_t length);



    struct ReturnData {

        uint32_t displayRequests = 0;



        std::vector<Layer> changedLayers;

        std::vector<IComposerClient::Composition> compositionTypes;



        std::vector<Layer> requestedLayers;

        std::vector<uint32_t> requestMasks;



        int presentFence = -1;



        std::vector<Layer> releasedLayers;

        std::vector<int> releaseFences;



        uint32_t presentOrValidateState;



        // Composer 2.4 implementation can return a client target property

        // structure to indicate the client target properties that hardware

        // composer requests. The composer client must change the client target

        // properties to match this request.

        IComposerClient::ClientTargetProperty clientTargetProperty{PixelFormat::RGBA_8888,

                                                                   Dataspace::UNKNOWN};

    };



    std::vector<CommandError> mErrors;

    std::unordered_map<Display, ReturnData> mReturnData;



    // When SELECT_DISPLAY is parsed, this is updated to point to the

    // display's return data in mReturnData.  We use it to avoid repeated

    // map lookups.

    ReturnData* mCurrentReturnData;

};



// Composer is a wrapper to IComposer, a proxy to server-side composer.

// Composer is a wrapper to IComposer, a proxy to server-side composer.

class Composer final : public Hwc2::Composer {

class Composer final : public Hwc2::Composer {

public:

public:
@@ -502,6 +597,186 @@ private: 
    CommandReader mReader;

    CommandReader mReader;

};

};





// Composer is a wrapper to IComposer, a proxy to server-side composer.

class AidlComposer final : public Hwc2::Composer {

public:

    explicit AidlComposer(const std::string& serviceName);

    ~AidlComposer() override;



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

    std::string dumpDebugInfo() override;



    void registerCallback(const sp<IComposerCallback>& callback) override;



    // Reset all pending commands in the command buffer. Useful if you want to

    // skip a frame but have already queued some commands.

    void resetCommands() override;



    // Explicitly flush all pending commands in the command buffer.

    Error executeCommands() override;



    uint32_t getMaxVirtualDisplayCount() override;

    Error createVirtualDisplay(uint32_t width, uint32_t height, PixelFormat* format,

                               Display* outDisplay) override;

    Error destroyVirtualDisplay(Display display) override;



    Error acceptDisplayChanges(Display display) override;



    Error createLayer(Display display, Layer* outLayer) override;

    Error destroyLayer(Display display, Layer layer) override;



    Error getActiveConfig(Display display, Config* outConfig) override;

    Error getChangedCompositionTypes(Display display, std::vector<Layer>* outLayers,

                                     std::vector<IComposerClient::Composition>* outTypes) override;

    Error getColorModes(Display display, std::vector<ColorMode>* outModes) override;

    Error getDisplayAttribute(Display display, Config config, IComposerClient::Attribute attribute,

                              int32_t* outValue) override;

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

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



    Error getDisplayRequests(Display display, uint32_t* outDisplayRequestMask,

                             std::vector<Layer>* outLayers,

                             std::vector<uint32_t>* outLayerRequestMasks) override;



    Error getDozeSupport(Display display, bool* outSupport) override;

    Error getHdrCapabilities(Display display, std::vector<Hdr>* outTypes, float* outMaxLuminance,

                             float* outMaxAverageLuminance, float* outMinLuminance) override;



    Error getReleaseFences(Display display, std::vector<Layer>* outLayers,

                           std::vector<int>* outReleaseFences) override;



    Error presentDisplay(Display display, int* outPresentFence) override;



    Error setActiveConfig(Display display, Config config) override;



    /*

     * The composer caches client targets internally.  When target is nullptr,

     * the composer uses slot to look up the client target from its cache.

     * When target is not nullptr, the cache is updated with the new target.

     */

    Error setClientTarget(Display display, uint32_t slot, const sp<GraphicBuffer>& target,

                          int acquireFence, Dataspace dataspace,

                          const std::vector<IComposerClient::Rect>& damage) override;

    Error setColorMode(Display display, ColorMode mode, RenderIntent renderIntent) override;

    Error setColorTransform(Display display, const float* matrix, ColorTransform hint) override;

    Error setOutputBuffer(Display display, const native_handle_t* buffer,

                          int releaseFence) override;

    Error setPowerMode(Display display, IComposerClient::PowerMode mode) override;

    Error setVsyncEnabled(Display display, IComposerClient::Vsync enabled) override;



    Error setClientTargetSlotCount(Display display) override;



    Error validateDisplay(Display display, uint32_t* outNumTypes,

                          uint32_t* outNumRequests) override;



    Error presentOrValidateDisplay(Display display, uint32_t* outNumTypes, uint32_t* outNumRequests,

                                   int* outPresentFence, uint32_t* state) override;



    Error setCursorPosition(Display display, Layer layer, int32_t x, int32_t y) override;

    /* see setClientTarget for the purpose of slot */

    Error setLayerBuffer(Display display, Layer layer, uint32_t slot,

                         const sp<GraphicBuffer>& buffer, int acquireFence) override;

    Error setLayerSurfaceDamage(Display display, Layer layer,

                                const std::vector<IComposerClient::Rect>& damage) override;

    Error setLayerBlendMode(Display display, Layer layer, IComposerClient::BlendMode mode) override;

    Error setLayerColor(Display display, Layer layer, const IComposerClient::Color& color) override;

    Error setLayerCompositionType(Display display, Layer layer,

                                  IComposerClient::Composition type) override;

    Error setLayerDataspace(Display display, Layer layer, Dataspace dataspace) override;

    Error setLayerDisplayFrame(Display display, Layer layer,

                               const IComposerClient::Rect& frame) override;

    Error setLayerPlaneAlpha(Display display, Layer layer, float alpha) override;

    Error setLayerSidebandStream(Display display, Layer layer,

                                 const native_handle_t* stream) override;

    Error setLayerSourceCrop(Display display, Layer layer,

                             const IComposerClient::FRect& crop) override;

    Error setLayerTransform(Display display, Layer layer, Transform transform) override;

    Error setLayerVisibleRegion(Display display, Layer layer,

                                const std::vector<IComposerClient::Rect>& visible) override;

    Error setLayerZOrder(Display display, Layer layer, uint32_t z) override;



    // Composer HAL 2.2

    Error setLayerPerFrameMetadata(

            Display display, Layer layer,

            const std::vector<IComposerClient::PerFrameMetadata>& perFrameMetadatas) override;

    std::vector<IComposerClient::PerFrameMetadataKey> getPerFrameMetadataKeys(

            Display display) override;

    Error getRenderIntents(Display display, ColorMode colorMode,

                           std::vector<RenderIntent>* outRenderIntents) override;

    Error getDataspaceSaturationMatrix(Dataspace dataspace, mat4* outMatrix) override;



    // Composer HAL 2.3

    Error getDisplayIdentificationData(Display display, uint8_t* outPort,

                                       std::vector<uint8_t>* outData) override;

    Error setLayerColorTransform(Display display, Layer layer, const float* matrix) override;

    Error getDisplayedContentSamplingAttributes(Display display, PixelFormat* outFormat,

                                                Dataspace* outDataspace,

                                                uint8_t* outComponentMask) override;

    Error setDisplayContentSamplingEnabled(Display display, bool enabled, uint8_t componentMask,

                                           uint64_t maxFrames) override;

    Error getDisplayedContentSample(Display display, uint64_t maxFrames, uint64_t timestamp,

                                    DisplayedFrameStats* outStats) override;

    Error setLayerPerFrameMetadataBlobs(

            Display display, Layer layer,

            const std::vector<IComposerClient::PerFrameMetadataBlob>& metadata) override;

    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,

                                         IComposerClient::DisplayConnectionType* outType) override;

    V2_4::Error getDisplayVsyncPeriod(Display display, VsyncPeriodNanos* outVsyncPeriod) override;

    V2_4::Error setActiveConfigWithConstraints(

            Display display, Config config,

            const IComposerClient::VsyncPeriodChangeConstraints& vsyncPeriodChangeConstraints,

            VsyncPeriodChangeTimeline* outTimeline) override;

    V2_4::Error setAutoLowLatencyMode(Display displayId, bool on) override;

    V2_4::Error getSupportedContentTypes(

            Display displayId,

            std::vector<IComposerClient::ContentType>* outSupportedContentTypes) override;

    V2_4::Error setContentType(Display displayId,

                               IComposerClient::ContentType contentType) override;

    V2_4::Error setLayerGenericMetadata(Display display, Layer layer, const std::string& key,

                                        bool mandatory, const std::vector<uint8_t>& value) override;

    V2_4::Error getLayerGenericMetadataKeys(

            std::vector<IComposerClient::LayerGenericMetadataKey>* outKeys) override;

    Error getClientTargetProperty(

            Display display,

            IComposerClient::ClientTargetProperty* outClientTargetProperty) override;



private:

    class AidlCommandWriter : public AidlCommandWriterBase {

    public:

        explicit AidlCommandWriter(uint32_t initialMaxSize)

              : AidlCommandWriterBase(initialMaxSize) {}

        ~AidlCommandWriter() override {}

    };



    // Many public functions above simply write a command into the command

    // queue to batch the calls.  validateDisplay and presentDisplay will call

    // this function to execute the command queue.

    Error execute();



    // 64KiB minus a small space for metadata such as read/write pointers

    static constexpr size_t kWriterInitialSize = 64 * 1024 / sizeof(uint32_t) - 16;

    // Max number of buffers that may be cached for a given layer

    // We obtain this number by:

    // 1. Tightly coupling this cache to the max size of BufferQueue

    // 2. Adding an additional slot for the layer caching feature in SurfaceFlinger (see: Planner.h)

    static const constexpr uint32_t kMaxLayerBufferCount = BufferQueue::NUM_BUFFER_SLOTS + 1;

    AidlCommandWriter mWriter;

    AidlCommandReader mReader;



    // Aidl interface

    using AidlIComposer = aidl::android::hardware::graphics::composer3::IComposer;

    using AidlIComposerClient = aidl::android::hardware::graphics::composer3::IComposerClient;

    std::shared_ptr<AidlIComposer> mAidlComposer;

    std::shared_ptr<AidlIComposerClient> mAidlComposerClient;

    std::shared_ptr<AidlIComposerCallbackWrapper> mAidlComposerCallback;

};



} // namespace impl

} // namespace impl





} // namespace Hwc2

} // namespace Hwc2