commit 1dfaed1ca45d7672fb308873ce977624331aacc6
author Linux Build Service Account <lnxbuild@localhost> Sat Dec 07 23:19:28 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Dec 07 23:19:28 2013 -0800
tree 0e7c12dadbb483028b23d7fb6da1c654ffe9a87d
parent 83593a3aeb84cfca5fdeece6dd51b13a1ffb7c9f
parent 2babecc511488f806d1ab13ab5360d9ab02a2ae3

Merge "copybit: Set default value on COPYBIT_TRANSFORM for Color layer."

libcopybit/copybit.cpp

diff --git a/libcopybit/copybit.cpp b/libcopybit/copybit.cpp
index 47d9b93..9558f69 100644
--- a/libcopybit/copybit.cpp
+++ b/libcopybit/copybit.cpp
@@ -637,6 +637,7 @@
         return -EINVAL;
     }
 
+    int status = 0;
     struct blitReq* list = &ctx->list;
     mdp_blit_req* req = &list->req[list->count++];
     set_infos(ctx, req, MDP_SOLID_FILL);
@@ -654,7 +655,11 @@
     req->const_color.b = (uint32_t)((color >> 16) & 0xff);
     req->const_color.alpha = (uint32_t)((color >> 24) & 0xff);
 
-    int status = msm_copybit(ctx, list);
+    if (list->count == sizeof(list->req)/sizeof(list->req[0])) {
+        status = msm_copybit(ctx, list);
+        list->sync.acq_fen_fd_cnt = 0;
+        list->count = 0;
+    }
     return status;
 }
 

libhwcomposer/hwc_copybit.cpp

diff --git a/libhwcomposer/hwc_copybit.cpp b/libhwcomposer/hwc_copybit.cpp
index 48a0878..0ad1b14 100644
--- a/libhwcomposer/hwc_copybit.cpp
+++ b/libhwcomposer/hwc_copybit.cpp
@@ -617,6 +617,7 @@
     copybit->set_parameter(copybit, COPYBIT_DITHER,
                            (dst.format == HAL_PIXEL_FORMAT_RGB_565) ?
                            COPYBIT_ENABLE : COPYBIT_DISABLE);
+    copybit->set_parameter(copybit, COPYBIT_TRANSFORM, 0);
     copybit->set_parameter(copybit, COPYBIT_BLEND_MODE, layer->blending);
     copybit->set_parameter(copybit, COPYBIT_PLANE_ALPHA, layer->planeAlpha);
     copybit->set_parameter(copybit, COPYBIT_BLIT_TO_FRAMEBUFFER,COPYBIT_ENABLE);