Merge "hwc: Extend PTOR feature for two layers"

This commit is contained in:
Linux Build Service Account
2014-06-20 23:00:53 -07:00
committed by Gerrit - the friendly Code Review server
6 changed files with 226 additions and 122 deletions

View File

@@ -295,6 +295,7 @@ void initContext(hwc_context_t *ctx)
ctx->mGPUHintInfo.mCompositionState = COMPOSITION_STATE_MDP;
ctx->mGPUHintInfo.mCurrGPUPerfMode = EGL_GPU_LEVEL_0;
#endif
memset(&(ctx->mPtorInfo), 0, sizeof(ctx->mPtorInfo));
ALOGI("Initializing Qualcomm Hardware Composer");
ALOGI("MDP version: %d", ctx->mMDP.version);
}
@@ -1363,7 +1364,7 @@ int hwc_sync(hwc_context_t *ctx, hwc_display_contents_1_t* list, int dpy,
}
}
if ((fd >= 0) && !dpy && ctx->mMDPComp[dpy]->isPTORActive()) {
if ((fd >= 0) && !dpy && ctx->mPtorInfo.isActive()) {
// Acquire c2d fence of Overlap render buffer
acquireFd[count++] = fd;
}
@@ -1426,7 +1427,7 @@ int hwc_sync(hwc_context_t *ctx, hwc_display_contents_1_t* list, int dpy,
}
if (!dpy && ctx->mCopyBit[dpy]) {
if (ctx->mMDPComp[dpy]->isPTORActive())
if (ctx->mPtorInfo.isActive())
ctx->mCopyBit[dpy]->setReleaseFdSync(releaseFd);
else
ctx->mCopyBit[dpy]->setReleaseFd(releaseFd);