Merge remote-tracking branch 'caf/LA.BF.1.1.3_rb1.13' into cm-13.0-caf-8974stable/cm-13.0-caf-8974-ZNH5Ycm-13.0-caf-8974

3 files changed, 7 insertions, 13 deletions

diff --git a/libgralloc/alloc_controller.cpp b/libgralloc/alloc_controller.cpp
index ff62c6e1c..066a1fe33 100644
--- a/libgralloc/alloc_controller.cpp
+++ b/libgralloc/alloc_controller.cpp
@@ -93,7 +93,6 @@ AdrenoMemInfo::AdrenoMemInfo()
 {
     LINK_adreno_compute_aligned_width_and_height = NULL;
     LINK_adreno_compute_padding = NULL;
-    LINK_adreno_get_gpu_pixel_alignment = NULL;
 
     libadreno_utils = ::dlopen("libadreno_utils.so", RTLD_NOW);
     if (libadreno_utils) {
@@ -101,8 +100,6 @@ AdrenoMemInfo::AdrenoMemInfo()
             ::dlsym(libadreno_utils, "compute_aligned_width_and_height");
         *(void **)&LINK_adreno_compute_padding = ::dlsym(libadreno_utils,
                                            "compute_surface_padding");
-        *(void **)&LINK_adreno_get_gpu_pixel_alignment =
-                ::dlsym(libadreno_utils, "get_gpu_pixel_alignment");
     }
 }
 
@@ -167,22 +164,16 @@ void AdrenoMemInfo::getAlignedWidthAndHeight(int width, int height, int format,
             }
         }
     } else {
-        int alignment = 32;
         switch (format)
         {
             case HAL_PIXEL_FORMAT_YCrCb_420_SP_ADRENO:
-                aligned_w = ALIGN(width, alignment);
+                aligned_w = ALIGN(width, 32);
                 break;
             case HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED:
                 aligned_w = ALIGN(width, 128);
                 break;
             case HAL_PIXEL_FORMAT_YCbCr_420_SP:
             case HAL_PIXEL_FORMAT_YCrCb_420_SP:
-                if (LINK_adreno_get_gpu_pixel_alignment) {
-                    alignment = LINK_adreno_get_gpu_pixel_alignment();
-                }
-                aligned_w = ALIGN(width, alignment);
-                break;
             case HAL_PIXEL_FORMAT_YV12:
             case HAL_PIXEL_FORMAT_YCbCr_422_SP:
             case HAL_PIXEL_FORMAT_YCrCb_422_SP:
diff --git a/libgralloc/gr.h b/libgralloc/gr.h
index 484b98097..ce63d423a 100644
--- a/libgralloc/gr.h
+++ b/libgralloc/gr.h
@@ -120,6 +120,5 @@ class AdrenoMemInfo : public android::Singleton <AdrenoMemInfo>
                                                 int *aligned_w,
                                                 int *aligned_h);
 
-        unsigned int (*LINK_adreno_get_gpu_pixel_alignment) ();
 };
 #endif /* GR_H_ */
diff --git a/libhdmi/hdmi.cpp b/libhdmi/hdmi.cpp
index 2b50e517a..38f01559a 100644
--- a/libhdmi/hdmi.cpp
+++ b/libhdmi/hdmi.cpp
@@ -332,10 +332,14 @@ int HDMIDisplay::parseResolution(char* edidStr)
     // Parse this string to get mode(int)
     start = (char*) edidStr;
     end = &delim;
+    int edid_data;
     while(*end == delim) {
-        mEDIDModes[count] = (int) strtol(start, &end, 10);
+        edid_data = (int) strtol(start, &end, 10);
+        if(!isInterlacedMode(edid_data)) {
+            mEDIDModes[count] = edid_data;
+            count++;
+        }
         start = end+1;
-        count++;
     }
     ALOGD_IF(DEBUG, "In %s: count = %d", __FUNCTION__, count);
     for (int i = 0; i < count; i++)