summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Sanglard <sanglardf@google.com>2017-02-13 12:42:06 -0800
committerFabien Sanglard <sanglardf@google.com>2017-02-14 12:10:01 -0800
commita65b73f7ceada366254fb2fd8fd4b9f24dc870f4 (patch)
treebb79df9127a2d8dce936534146a0288630f376ad
parente95e911d43639ca5235e0304e6a64fe70faabe4f (diff)
downloadhwcomposer-a65b73f7ceada366254fb2fd8fd4b9f24dc870f4.tar.gz
Fix plane assignment issue for HWC2On1Adaptor.
Bug: 33487853 Change-Id: Ied2bc3577d8961abfdf8e6435f5fdad626480a7a
-rwxr-xr-xmoorefield_hdmi/common/base/HwcLayerList.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/moorefield_hdmi/common/base/HwcLayerList.cpp b/moorefield_hdmi/common/base/HwcLayerList.cpp
index c163c8a..479534c 100755
--- a/moorefield_hdmi/common/base/HwcLayerList.cpp
+++ b/moorefield_hdmi/common/base/HwcLayerList.cpp
@@ -267,6 +267,10 @@ bool HwcLayerList::initialize()
DEINIT_AND_RETURN_FALSE("layer %d is null", i);
}
+ if ((layer->compositionType != HWC_FRAMEBUFFER_TARGET) &&
+ (layer->compositionType != HWC_SIDEBAND))
+ layer->compositionType = HWC_FRAMEBUFFER;
+
HwcLayer *hwcLayer = new HwcLayer(i, layer);
if (!hwcLayer) {
DEINIT_AND_RETURN_FALSE("failed to allocate hwc layer %d", i);
@@ -905,7 +909,7 @@ DisplayPlane* HwcLayerList::getPlane(uint32_t index) const
return 0;
}
- if (hwcLayer->getHandle() == 0) {
+ if (hwcLayer->getLayer()->handle == 0) {
DLOGTRACE("plane is attached with invalid handle");
return 0;
}