commit dc203cd71abf3ebe77c6564aee54b34be9a06460
author Michael Bestas <mkbestas@lineageos.org> Fri Feb 18 17:19:02 2022 +0200
committer micky387 <mickaelsaibi@free.fr> Fri Sep 13 21:06:51 2024 -0400
tree 996bd3586d8d7980afa3aa20617dffce0b18f4f2
parent bc0c03d0a1b5b8dbe35af623d4bd53d9ec62185f

sf: Align virtual display changes with CAF

* These changes are part of CAF AOSP merge commits

Change-Id: I390f874347d259fca4429c19711be6c85b104090

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp

diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
index 2d0d2b3..71e5d1d 100644
--- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
+++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
@@ -330,8 +330,8 @@
     if (source == SOURCE_SCRATCH) {
         usage |= GRALLOC_USAGE_HW_FB;
         usage &= ~(GRALLOC_USAGE_HW_VIDEO_ENCODER);
-        VDS_LOGV("dequeueBuffer(%s): updated scratch buffer usage flags=%#" PRIx64,
-                dbgSourceStr(source), usage);
+        VDS_LOGV("%s(%s): updated scratch buffer usage flags=%#" PRIx64,
+                __func__, ftl::enum_string(source).c_str(), usage);
     }
 
     status_t result =

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 1a81256..6321883 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3819,10 +3819,11 @@
         status = state.surface->query(NATIVE_WINDOW_FORMAT, &format);
         ALOGE_IF(status != NO_ERROR, "Unable to query format (%d)", status);
         pixelFormat = static_cast<ui::PixelFormat>(format);
-        if (mUseHwcVirtualDisplays) {
+        if (mVirtualDisplayIdGenerators.hal) {
+            size_t maxVirtualDisplaySize = getHwComposer().getMaxVirtualDisplayDimension();
             if (maxVirtualDisplaySize == 0 ||
-                ((uint64_t)width <= maxVirtualDisplaySize &&
-                (uint64_t)height <= maxVirtualDisplaySize)) {
+                ((uint64_t)resolution.width <= maxVirtualDisplaySize &&
+                (uint64_t)resolution.height <= maxVirtualDisplaySize)) {
                 uint64_t usage = 0;
                 // Replace with native_window_get_consumer_usage ?
                 status = state .surface->getConsumerUsage(&usage);