hwc: Disable mixed mode composition for secure videos

Also make sure layer cache is used correctly when
we're not using MDP composition

Bug: 7643563
Change-Id: I4dcd70c2da128b2dcbe0b72dc14031983649719d
Signed-off-by: Iliyan Malchev <malchev@google.com>
Signed-off-by: Naseer Ahmed <naseer@codeaurora.org>
This commit is contained in:
Naseer Ahmed
2012-12-01 18:12:59 -05:00
parent 768619ecdf
commit 76e313c901
2 changed files with 4 additions and 1 deletions

View File

@@ -123,11 +123,11 @@ static int hwc_prepare_primary(hwc_composer_device_1 *dev,
hwc_layer_1_t *fbLayer = &list->hwLayers[last]; hwc_layer_1_t *fbLayer = &list->hwLayers[last];
if(fbLayer->handle) { if(fbLayer->handle) {
setListStats(ctx, list, HWC_DISPLAY_PRIMARY); setListStats(ctx, list, HWC_DISPLAY_PRIMARY);
ctx->mLayerCache->updateLayerCache(list);
reset_layer_prop(ctx, HWC_DISPLAY_PRIMARY); reset_layer_prop(ctx, HWC_DISPLAY_PRIMARY);
if(!MDPComp::configure(ctx, list)) { if(!MDPComp::configure(ctx, list)) {
VideoOverlay::prepare(ctx, list, HWC_DISPLAY_PRIMARY); VideoOverlay::prepare(ctx, list, HWC_DISPLAY_PRIMARY);
FBUpdate::prepare(ctx, fbLayer, HWC_DISPLAY_PRIMARY); FBUpdate::prepare(ctx, fbLayer, HWC_DISPLAY_PRIMARY);
ctx->mLayerCache->updateLayerCache(list);
} }
} }
} }

View File

@@ -264,6 +264,9 @@ bool MDPComp::isDoable(hwc_context_t *ctx, hwc_display_contents_1_t* list) {
return false; return false;
} }
if(ctx->mSecureMode)
return false;
//Check for skip layers //Check for skip layers
if(isSkipPresent(ctx)) { if(isSkipPresent(ctx)) {
ALOGD_IF(isDebug(), "%s: Skip layers are present",__FUNCTION__); ALOGD_IF(isDebug(), "%s: Skip layers are present",__FUNCTION__);