commit c94f2f1cb2a8d3f3d57d67687e97aa7fdf896728
author Linux Build Service Account <lnxbuild@localhost> Fri Feb 01 19:46:50 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Feb 01 19:46:50 2013 -0800
tree 209687ebc7bbe87e7a3c466556b61dfb1883920f
parent ef72483668b7092c253e81358e89914b76a3e830
parent cf53700d9f69e871f81c2263840c8109ebcbf17f

Merge "libhwcomposer: Allow 2 YUV layer frames to use MDP composition"

libexternal/external.cpp

diff --git a/libexternal/external.cpp b/libexternal/external.cpp
index ecacd7b..b721195 100644
--- a/libexternal/external.cpp
+++ b/libexternal/external.cpp
@@ -240,8 +240,9 @@
     info.reserved[0] = 0;
     info.reserved[1] = 0;
     info.reserved[2] = 0;
+#ifndef FB_METADATA_VIDEO_INFO_CODE_SUPPORT
     info.reserved[3] = (info.reserved[3] & 0xFFFF) | (video_format << 16);
-
+#endif
     info.xoffset = 0;
     info.yoffset = 0;
     info.xres = active_h;
@@ -537,6 +538,16 @@
             ALOGD("In %s: FBIOPUT_VSCREENINFO failed Err Str = %s",
                                                  __FUNCTION__, strerror(errno));
         }
+#ifdef FB_METADATA_VIDEO_INFO_CODE_SUPPORT
+        struct msmfb_metadata metadata;
+        memset(&metadata, 0 , sizeof(metadata));
+        metadata.op = metadata_op_vic;
+        metadata.data.video_info_code = mode->video_format;
+        if (ioctl(mFd, MSMFB_METADATA_SET, &metadata) == -1) {
+            ALOGD("In %s: MSMFB_METADATA_SET failed Err Str = %s",
+                                                 __FUNCTION__, strerror(errno));
+        }
+#endif
         mCurrentMode = ID;
     }
 }

libgralloc/mapper.cpp

diff --git a/libgralloc/mapper.cpp b/libgralloc/mapper.cpp
index 197c372..b3e371a 100644
--- a/libgralloc/mapper.cpp
+++ b/libgralloc/mapper.cpp
@@ -117,7 +117,10 @@
             }
         }
     }
+    /* need to initialize the pointer to NULL otherwise unmapping for that
+     * buffer happens twice which leads to crash */
     hnd->base = 0;
+    hnd->base_metadata = 0;
     return 0;
 }
 
@@ -144,6 +147,7 @@
 
     private_handle_t* hnd = (private_handle_t*)handle;
     hnd->base = 0;
+    hnd->base_metadata = 0;
     void *vaddr;
     int err = gralloc_map(module, handle, &vaddr);
     if (err) {
@@ -190,6 +194,7 @@
         gralloc_unmap(module, handle);
     }
     hnd->base = 0;
+    hnd->base_metadata = 0;
     // Release the genlock
     if (-1 != hnd->genlockHandle) {
         return genlock_release_lock((native_handle_t *)handle);