summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManoj Kumar AVM <manojavm@codeaurora.org>2015-10-02 14:53:50 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-11-02 08:15:21 -0800
commitf8ea9b579653756d5adb1f0f09cec41857923ae8 (patch)
tree8a4f886c433734640c801a1eac2143b5766118f4
parent81c57b314972b8f15e450b71fbafa1c826e914a2 (diff)
downloadframeworks_native-f8ea9b579653756d5adb1f0f09cec41857923ae8.zip
frameworks_native-f8ea9b579653756d5adb1f0f09cec41857923ae8.tar.gz
frameworks_native-f8ea9b579653756d5adb1f0f09cec41857923ae8.tar.bz2
sf: vds: Avoid HWC for certain scenarios
Reserve HWC for VDS for WFD use case. During WFD usecase, sink usage will contain GRALLOC_USAGE_PRIVATE_WFD flag. When HWC is avoided, all virtual displays are composed using GLES. This means that GLES composes directly into the sink buffer and signals the consumer. Furthermore, it is expected that any color conversion will be handled on the consumer side. CRs-Fixed: 908380 Change-Id: I93ff54c79ece788b6caf3f4172835d8ac1362f62
-rw-r--r--services/surfaceflinger/DisplayUtils.cpp15
-rw-r--r--services/surfaceflinger/DisplayUtils.h1
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp15
3 files changed, 28 insertions, 3 deletions
diff --git a/services/surfaceflinger/DisplayUtils.cpp b/services/surfaceflinger/DisplayUtils.cpp
index e4e2183..83d84aa 100644
--- a/services/surfaceflinger/DisplayUtils.cpp
+++ b/services/surfaceflinger/DisplayUtils.cpp
@@ -44,6 +44,9 @@
#include <DisplayHardware/ExHWComposer.h>
#include <DisplayHardware/ExVirtualDisplaySurface.h>
#include <dlfcn.h>
+#if QTI_BSP
+#include <gralloc_priv.h>
+#endif
namespace android {
@@ -157,5 +160,17 @@ bool DisplayUtils::createV4L2BasedVirtualDisplay(HWComposer* hwc, int32_t &hwcDi
return false;
}
+bool DisplayUtils::canAllocateHwcDisplayIdForVDS(int usage) {
+ // on AOSP builds with QTI_BSP disabled, we should allocate hwc display id for virtual display
+ int flag_mask = 0xffffffff;
+
+#if QTI_BSP
+ // Reserve hardware acceleration for WFD use-case
+ flag_mask = GRALLOC_USAGE_PRIVATE_WFD;
+#endif
+
+ return (usage & flag_mask);
+}
+
}; // namespace android
diff --git a/services/surfaceflinger/DisplayUtils.h b/services/surfaceflinger/DisplayUtils.h
index cdf2b67..bb3d16b 100644
--- a/services/surfaceflinger/DisplayUtils.h
+++ b/services/surfaceflinger/DisplayUtils.h
@@ -61,6 +61,7 @@ class DisplayUtils {
sp<IGraphicBufferProducer> &producer, sp<IGraphicBufferProducer> bqProducer,
sp<IGraphicBufferConsumer> bqConsumer, String8 currentStateDisplayName,
bool currentStateIsSecure, int currentStateType);
+ bool canAllocateHwcDisplayIdForVDS(int usage);
DisplayUtils();
private:
static DisplayUtils* sDisplayUtils;
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 21c8aa5..5f37b0b 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1430,6 +1430,7 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags)
if (state.surface != NULL) {
int width = 0;
+ DisplayUtils* displayUtils = DisplayUtils::getInstance();
int status = state.surface->query(
NATIVE_WINDOW_WIDTH, &width);
ALOGE_IF(status != NO_ERROR,
@@ -1442,11 +1443,19 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags)
if (MAX_VIRTUAL_DISPLAY_DIMENSION == 0 ||
(width <= MAX_VIRTUAL_DISPLAY_DIMENSION &&
height <= MAX_VIRTUAL_DISPLAY_DIMENSION)) {
- hwcDisplayId = allocateHwcDisplayId(state.type);
+ int usage = 0;
+ status = state.surface->query(
+ NATIVE_WINDOW_CONSUMER_USAGE_BITS, &usage);
+ ALOGW_IF(status != NO_ERROR,
+ "Unable to query usage (%d)", status);
+ if ( (status == NO_ERROR) &&
+ displayUtils->canAllocateHwcDisplayIdForVDS(usage)) {
+ hwcDisplayId = allocateHwcDisplayId(state.type);
+ }
}
- DisplayUtils::getInstance()->initVDSInstance(mHwc, hwcDisplayId,
- state.surface, dispSurface, producer, bqProducer, bqConsumer,
+ displayUtils->initVDSInstance(mHwc, hwcDisplayId, state.surface,
+ dispSurface, producer, bqProducer, bqConsumer,
state.displayName, state.isSecure, state.type);
}