commit 4314d96ed6425de711d74e262cd4ce3ad8107e6b
author Linux Build Service Account <lnxbuild@localhost> Wed May 15 03:52:14 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed May 15 03:52:14 2013 -0700
tree ca5b98354ed5f332be37a8055b57affdefcdb5b2
parent 54e97253bdfe6f6ddc3eb3fef3d1e4b14cddc75b
parent 1cac81521d81f78bd484064d6c4956d30bb0e6f9

Merge "hwc/overlay: Crop x, y, w and h should be even for MDSS Rotator."

libexternal/external.cpp

diff --git a/libexternal/external.cpp b/libexternal/external.cpp
index 3e92f53..73e145f 100644
--- a/libexternal/external.cpp
+++ b/libexternal/external.cpp
@@ -746,6 +746,11 @@
             height = 1024;
             fps = 60;
             break;
+        case HDMI_VFRMT_1024x768p60_4_3:
+            width = 1024;
+            height = 768;
+            fps = 60;
+            break;
         case HDMI_VFRMT_1920x1080p24_16_9:
             width = 1920;
             height = 1080;

libqdutils/mdp_version.cpp

diff --git a/libqdutils/mdp_version.cpp b/libqdutils/mdp_version.cpp
index 86e744d..e328d23 100644
--- a/libqdutils/mdp_version.cpp
+++ b/libqdutils/mdp_version.cpp
@@ -93,10 +93,14 @@
         } else {
             mdp_version = MDP_V_UNKNOWN;
         }
-        int len = strlen("msmfbXX_");
-        if (mdp_version == MDP_V3_0_3)
-            len++;
-        panel_type = fb_finfo.id[len];
+
+        /* Assumes panel type is 2nd element in '_' delimited id string */
+        char * ptype = strstr(fb_finfo.id, "_");
+        if (!ptype || (*(++ptype) == '\0')) {
+            ALOGE("Invalid framebuffer info string: %s", fb_finfo.id);
+            ptype = fb_finfo.id;
+        }
+        panel_type = *ptype;
 
     }
     close(fb_fd);