commit b974ae0e5001b29329380d04be0e436ae6424cad
author Linux Build Service Account <lnxbuild@localhost> Fri Mar 22 19:08:12 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Mar 22 19:08:12 2013 -0700
tree 5d54d90f276335cf0b512532f677d5c5655fa29d
parent 9c301a18c67f6fd21a4f8f699b3880cb246fda7f
parent 0e8efb8afd864e1c0c650089f8160b29cc814ea5

Merge "hwc: fix dst calculations for right mixer"

libcopybit/copybit_c2d.cpp

diff --git a/libcopybit/copybit_c2d.cpp b/libcopybit/copybit_c2d.cpp
index dfbbf76..fa63b4c 100644
--- a/libcopybit/copybit_c2d.cpp
+++ b/libcopybit/copybit_c2d.cpp
@@ -1284,8 +1284,7 @@
         return COPYBIT_FAILURE;
     }
 
-    src_surface.config_mask = C2D_NO_BILINEAR_BIT | C2D_NO_ANTIALIASING_BIT |
-                              ctx->config_mask;
+    src_surface.config_mask = C2D_NO_ANTIALIASING_BIT | ctx->config_mask;
     src_surface.global_alpha = ctx->src_global_alpha;
     if (enableBlend) {
         if(src_surface.config_mask & C2D_GLOBAL_ALPHA_BIT) {

libhwcomposer/hwc_vsync.cpp

diff --git a/libhwcomposer/hwc_vsync.cpp b/libhwcomposer/hwc_vsync.cpp
index 559cd7d..b42043f 100644
--- a/libhwcomposer/hwc_vsync.cpp
+++ b/libhwcomposer/hwc_vsync.cpp
@@ -136,9 +136,11 @@
             cur_timestamp = systemTime();
         }
         // send timestamp to HAL
-        ALOGD_IF (logvsync, "%s: timestamp %llu sent to HWC for %s",
-                  __FUNCTION__, cur_timestamp, "fb0");
-        ctx->proc->vsync(ctx->proc, dpy, cur_timestamp);
+        if(ctx->vstate.enable) {
+            ALOGD_IF (logvsync, "%s: timestamp %llu sent to HWC for %s",
+                      __FUNCTION__, cur_timestamp, "fb0");
+            ctx->proc->vsync(ctx->proc, dpy, cur_timestamp);
+        }
 
     } while (true);
     if(fd_timestamp >= 0)