summaryrefslogtreecommitdiffstats
path: root/hwc
diff options
context:
space:
mode:
authorLajos Molnar <lajos@ti.com>2011-12-13 16:34:55 -0600
committerErik Gilling <konkers@android.com>2011-12-13 15:12:33 -0800
commit449e98a958753e6ae8f16b923596af0c6783ff8a (patch)
tree660608fca544895e3a2ee071b1f3f7e252621139 /hwc
parent0aead355133c2a087cb369c5eb62a07cbd4a13be (diff)
downloadhardware_ti_omap4xxx-449e98a958753e6ae8f16b923596af0c6783ff8a.zip
hardware_ti_omap4xxx-449e98a958753e6ae8f16b923596af0c6783ff8a.tar.gz
hardware_ti_omap4xxx-449e98a958753e6ae8f16b923596af0c6783ff8a.tar.bz2
hwc: set FB z-order when there are no hwc layers
When there are no layers passed to hwc, FB is still used, and z-order must be set. Change-Id: I7e45f56468b47712f7686b78ba0650943037c64a Signed-off-by: Lajos Molnar <lajos@ti.com>
Diffstat (limited to 'hwc')
-rw-r--r--hwc/hwc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/hwc/hwc.c b/hwc/hwc.c
index 1654680..8dc39e0 100644
--- a/hwc/hwc.c
+++ b/hwc/hwc.c
@@ -1292,8 +1292,11 @@ static int omap4_hwc_prepare(struct hwc_composer_device *dev, hwc_layer_list_t*
if (hwc_dev->use_sgx) {
/* assign a z-layer for fb */
- if (fb_z < 0)
- LOGE("**** should have assigned z-layer for fb");
+ if (fb_z < 0) {
+ if (num.composited_layers)
+ LOGE("**** should have assigned z-layer for fb");
+ fb_z = z++;
+ }
hwc_dev->buffers[0] = NULL;
omap4_hwc_setup_layer_base(&dsscomp->ovls[0].cfg, fb_z,