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

This commit is contained in:
Linux Build Service Account
2013-12-07 23:19:28 -08:00
committed by Gerrit - the friendly Code Review server
2 changed files with 7 additions and 1 deletions

View File

@@ -637,6 +637,7 @@ static int fill_color(struct copybit_device_t *dev,
return -EINVAL; return -EINVAL;
} }
int status = 0;
struct blitReq* list = &ctx->list; struct blitReq* list = &ctx->list;
mdp_blit_req* req = &list->req[list->count++]; mdp_blit_req* req = &list->req[list->count++];
set_infos(ctx, req, MDP_SOLID_FILL); set_infos(ctx, req, MDP_SOLID_FILL);
@@ -654,7 +655,11 @@ static int fill_color(struct copybit_device_t *dev,
req->const_color.b = (uint32_t)((color >> 16) & 0xff); req->const_color.b = (uint32_t)((color >> 16) & 0xff);
req->const_color.alpha = (uint32_t)((color >> 24) & 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; return status;
} }

View File

@@ -617,6 +617,7 @@ int CopyBit::fillColorUsingCopybit(hwc_layer_1_t *layer,
copybit->set_parameter(copybit, COPYBIT_DITHER, copybit->set_parameter(copybit, COPYBIT_DITHER,
(dst.format == HAL_PIXEL_FORMAT_RGB_565) ? (dst.format == HAL_PIXEL_FORMAT_RGB_565) ?
COPYBIT_ENABLE : COPYBIT_DISABLE); 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_BLEND_MODE, layer->blending);
copybit->set_parameter(copybit, COPYBIT_PLANE_ALPHA, layer->planeAlpha); copybit->set_parameter(copybit, COPYBIT_PLANE_ALPHA, layer->planeAlpha);
copybit->set_parameter(copybit, COPYBIT_BLIT_TO_FRAMEBUFFER,COPYBIT_ENABLE); copybit->set_parameter(copybit, COPYBIT_BLIT_TO_FRAMEBUFFER,COPYBIT_ENABLE);