Merge remote-tracking branch 'cm/cm-10.1' into jellybean-4.2

OpenSEMC · Jun 27, 2013 · b8af2f3 · b8af2f3
2 parents 23cace9 + a4efdde
commit b8af2f3
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/liboverlay/overlay.cpp b/liboverlay/overlay.cpp
@@ -252,12 +252,15 @@ int Overlay::initOverlay() {
                 ALOGD("ndx=%d num=%d z_order=%d", minfo->pndx, minfo->pnum,
                       minfo->z_order);
                 // clear any pipe connected to mixer including base pipe.
-                int index = minfo->pndx;
-                ALOGD("Unset overlay with index: %d at mixer %d", index, i);
-                if(ioctl(fd, MSMFB_OVERLAY_UNSET, &index) == -1) {
-                    ALOGE("ERROR: MSMFB_OVERLAY_UNSET failed");
-                    close(fd);
-                    return -1;
+                if (qdutils::MDPVersion::getInstance().getMDPVersion() >= qdutils::MDP_V4_2 ||
+                        (minfo->z_order) != -1) {
+                    int index = minfo->pndx;
+                    ALOGD("Unset overlay with index: %d at mixer %d", index, i);
+                    if(ioctl(fd, MSMFB_OVERLAY_UNSET, &index) == -1) {
+                        ALOGE("ERROR: MSMFB_OVERLAY_UNSET failed");
+                        close(fd);
+                        return -1;
+                    }
                 }
                 minfo++;
             }