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

Commit a5f2f125 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4963492 from 99b4619c to pi-qpr1-release 

Change-Id: I81bdfaf735a3fcfa8684edbf06534ce717965a08
parents 6d3b5171 99b4619c

services/surfaceflinger/SurfaceFlinger.cpp

+13 −6
Original line number Diff line number Diff line
@@ -2180,11 +2180,15 @@ void SurfaceFlinger::postFramebuffer() 
        displayDevice->onSwapBuffersCompleted();

        displayDevice->makeCurrent();

        for (auto& layer : displayDevice->getVisibleLayersSortedByZ()) {

            sp<Fence> releaseFence = Fence::NO_FENCE;



            // The layer buffer from the previous frame (if any) is released

            // by HWC only when the release fence from this frame (if any) is

            // signaled.  Always get the release fence from HWC first.

            auto hwcLayer = layer->getHwcLayer(hwcId);

            sp<Fence> releaseFence = getBE().mHwc->getLayerReleaseFence(hwcId, hwcLayer);

            if (hwcId >= 0) {

                releaseFence = getBE().mHwc->getLayerReleaseFence(hwcId, hwcLayer);

            }



            // If the layer was client composited in the previous frame, we

            // need to merge with the previous client target acquire fence.
@@ -2331,8 +2335,10 @@ sp<DisplayDevice> SurfaceFlinger::setupNewDisplayDeviceInternal( 
        const sp<DisplaySurface>& dispSurface, const sp<IGraphicBufferProducer>& producer) {

    bool hasWideColorGamut = false;

    std::unordered_map<ColorMode, std::vector<RenderIntent>> hwcColorModes;

    HdrCapabilities hdrCapabilities;

    int32_t supportedPerFrameMetadata = 0;



    if (hasWideColorDisplay) {

    if (hasWideColorDisplay && hwcId >= 0) {

        std::vector<ColorMode> modes = getHwComposer().getColorModes(hwcId);

        for (ColorMode colorMode : modes) {

            switch (colorMode) {
@@ -2351,8 +2357,10 @@ sp<DisplayDevice> SurfaceFlinger::setupNewDisplayDeviceInternal( 
        }

    }



    HdrCapabilities hdrCapabilities;

    if (hwcId >= 0) {

        getHwComposer().getHdrCapabilities(hwcId, &hdrCapabilities);

        supportedPerFrameMetadata = getHwComposer().getSupportedPerFrameMetadata(hwcId);

    }



    auto nativeWindowSurface = mCreateNativeWindowSurface(producer);

    auto nativeWindow = nativeWindowSurface->getNativeWindow();
@@ -2386,8 +2394,7 @@ sp<DisplayDevice> SurfaceFlinger::setupNewDisplayDeviceInternal( 
            new DisplayDevice(this, state.type, hwcId, state.isSecure, display, nativeWindow,

                              dispSurface, std::move(renderSurface), displayWidth, displayHeight,

                              hasWideColorGamut, hdrCapabilities,

                              getHwComposer().getSupportedPerFrameMetadata(hwcId),

                              hwcColorModes, initialPowerMode);

                              supportedPerFrameMetadata, hwcColorModes, initialPowerMode);



    if (maxFrameBufferAcquiredBuffers >= 3) {

        nativeWindowSurface->preallocateBuffers();

services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp

+1 −2
Original line number Diff line number Diff line
@@ -658,8 +658,7 @@ using NonHwcVirtualDisplayCase = 
using SimpleHwcVirtualDisplayVariant = HwcVirtualDisplayVariant<1024, 768, Secure::TRUE>;

using HwcVirtualDisplayCase =

        Case<SimpleHwcVirtualDisplayVariant, WideColorSupportNotConfiguredVariant,

             HdrNotSupportedVariant<SimpleHwcVirtualDisplayVariant>,

             NoPerFrameMetadataSupportVariant<SimpleHwcVirtualDisplayVariant>>;

             NonHwcDisplayHdrSupportVariant, NonHwcPerFrameMetadataSupportVariant>;

using WideColorP3ColorimetricDisplayCase =

        Case<PrimaryDisplayVariant, WideColorP3ColorimetricSupportedVariant<PrimaryDisplayVariant>,

             HdrNotSupportedVariant<PrimaryDisplayVariant>,