commit 1c47cede9291bcff8d844f36cf6b96e6f44a9e1c
author Linux Build Service Account <lnxbuild@localhost> Thu Aug 07 06:58:07 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Aug 07 06:58:07 2014 -0700
tree 01ce44fc995bd0be74e3b4fe748211664823d5ca
parent cf76c85c9122e5378cb8e0f1688ae728085f7cf7
parent cda012c67449bf60c2b8c8d64923a6994471f00c

Merge "hwc: Configure MDP with updated content attributes of PTOR layers"

libcopybit/software_converter.cpp

diff --git a/libcopybit/software_converter.cpp b/libcopybit/software_converter.cpp
index 71e685e..9ea8767 100644
--- a/libcopybit/software_converter.cpp
+++ b/libcopybit/software_converter.cpp
@@ -60,7 +60,7 @@
     unsigned char* oldChroma = (unsigned char*)(hnd->base + y_size);
     memcpy((char *)yv12_handle->base,(char *)hnd->base,y_size);
 
-#ifdef __ARM_HAVE_NEON
+#if defined(__ARM_HAVE_NEON) && !defined(__aarch64__)
    /* interleave */
     if(!chromaPadding) {
         unsigned char * t1 = newChroma;

libhwcomposer/hwc_uevents.cpp

diff --git a/libhwcomposer/hwc_uevents.cpp b/libhwcomposer/hwc_uevents.cpp
index fed6f3c..94191b7 100644
--- a/libhwcomposer/hwc_uevents.cpp
+++ b/libhwcomposer/hwc_uevents.cpp
@@ -280,7 +280,7 @@
             if(dpy == HWC_DISPLAY_EXTERNAL ||
                ctx->mVirtualonExtActive) {
                 /* External display is HDMI or non-hybrid WFD solution */
-                ALOGE_IF(UEVENT_DEBUG, "%s: Sending EXTERNAL_OFFLINE ONLINE"
+                ALOGE_IF(UEVENT_DEBUG, "%s: Sending EXTERNAL ONLINE"
                          "hotplug event", __FUNCTION__);
                 ctx->proc->hotplug(ctx->proc,HWC_DISPLAY_EXTERNAL,
                                    EXTERNAL_ONLINE);