summaryrefslogtreecommitdiff
path: root/hwc/hwc.c
diff options
context:
space:
mode:
authorLajos Molnar <lajos@ti.com>2011-12-13 17:29:10 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-13 17:29:10 -0800
commitba56cfd0de81c590a026fa32061b2a9f53ca8550 (patch)
treef1b99095af05e08bc4bf5e0f309815ec16771b1d /hwc/hwc.c
parenta50e8216fafe5343bece7617f5f9dc101210a775 (diff)
parent40e6beac1e9977ff2ca763e6e8abcc2463fa76cf (diff)
downloadomap4xxx-omapzoom-ba56cfd0de81c590a026fa32061b2a9f53ca8550.tar.gz
am 40e6beac: am 449e98a9: hwc: set FB z-order when there are no hwc layers
* commit '40e6beac1e9977ff2ca763e6e8abcc2463fa76cf': hwc: set FB z-order when there are no hwc layers
Diffstat (limited to 'hwc/hwc.c')
-rw-r--r--hwc/hwc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/hwc/hwc.c b/hwc/hwc.c
index 3d580dae..4450ccdb 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,