hwc: Implement mixed mode composition.
With this change we are moving MDP composition from all-or-nothing
implementation to mixed mode implementation where layers can
partially be composited through MDP and while rest of the layers are
composed / cached in framebuffer.
- Mixed mode design is based on layer caching
- Mixed mode path is configured only when non-bypassing
layers are cached.
- Never allow mixed mode when FB needs to be udpated.
- If we cannot bypass all MDP comp marked layers, bail
out completely.
Change-Id: Ie08f39db07e032b537f042d0d2bfe772ebfed049
diff --git a/libhwcomposer/hwc_fbupdate.cpp b/libhwcomposer/hwc_fbupdate.cpp
index 6d0b85f..f1f81c1 100644
--- a/libhwcomposer/hwc_fbupdate.cpp
+++ b/libhwcomposer/hwc_fbupdate.cpp
@@ -21,7 +21,6 @@
#define DEBUG_FBUPDATE 0
#include <gralloc_priv.h>
#include "hwc_fbupdate.h"
-#include "hwc_video.h"
namespace qhwc {
@@ -38,16 +37,6 @@
mModeOn = false;
}
-bool IFBUpdate::needFbUpdate(hwc_context_t *ctx,
- const hwc_display_contents_1_t *list, int dpy) {
- // if Video Overlay is on and and YUV layers are passed through overlay
- // , no need to configure FB layer.
- if(ctx->mVidOv[dpy]->isModeOn() &&
- (ctx->listStats[dpy].yuvCount == ctx->listStats[dpy].numAppLayers))
- return false;
-
- return true;
-}
//================= Low res====================================
FBUpdateLowRes::FBUpdateLowRes(const int& dpy): IFBUpdate(dpy) {}
@@ -56,79 +45,65 @@
mDest = ovutils::OV_INVALID;
}
-bool FBUpdateLowRes::prepare(hwc_context_t *ctx, hwc_display_contents_1 *list)
-{
+bool FBUpdateLowRes::prepare(hwc_context_t *ctx, hwc_display_contents_1 *list,
+ int fbZorder) {
if(!ctx->mMDP.hasOverlay) {
ALOGD_IF(DEBUG_FBUPDATE, "%s, this hw doesnt support overlays",
- __FUNCTION__);
- return false;
+ __FUNCTION__);
+ return false;
}
- mModeOn = configure(ctx, list);
- ALOGD_IF(DEBUG_FBUPDATE, "%s, mModeOn = %d", __FUNCTION__, mModeOn);
+ mModeOn = configure(ctx, list, fbZorder);
return mModeOn;
}
// Configure
-bool FBUpdateLowRes::configure(hwc_context_t *ctx,
- hwc_display_contents_1 *list)
-{
+bool FBUpdateLowRes::configure(hwc_context_t *ctx, hwc_display_contents_1 *list,
+ int fbZorder) {
bool ret = false;
hwc_layer_1_t *layer = &list->hwLayers[list->numHwLayers - 1];
if (LIKELY(ctx->mOverlay)) {
- // When Video overlay is in use and there are no UI layers to
- // be composed to FB , no need to configure FbUpdate.
- if(!needFbUpdate(ctx, list, mDpy))
- return false;
-
overlay::Overlay& ov = *(ctx->mOverlay);
private_handle_t *hnd = (private_handle_t *)layer->handle;
ovutils::Whf info(hnd->width, hnd->height,
- ovutils::getMdpFormat(hnd->format), hnd->size);
+ ovutils::getMdpFormat(hnd->format), hnd->size);
//Request an RGB pipe
- ovutils::eDest dest = ov.nextPipe(ovutils::OV_MDP_PIPE_RGB, mDpy);
+ ovutils::eDest dest = ov.nextPipe(ovutils::OV_MDP_PIPE_ANY, mDpy);
if(dest == ovutils::OV_INVALID) { //None available
return false;
}
mDest = dest;
- ovutils::eMdpFlags mdpFlags = ovutils::OV_MDP_FLAGS_NONE;
- // If any of the layers has pre-multiplied alpha, set Pre multiplied
- // Flag as the compositied output is alpha pre-multiplied.
- if(ctx->listStats[mDpy].preMultipliedAlpha == true)
- ovutils::setMdpFlags(mdpFlags, ovutils::OV_MDP_BLEND_FG_PREMULT);
+ ovutils::eMdpFlags mdpFlags = ovutils::OV_MDP_BLEND_FG_PREMULT;
- ovutils::eZorder z_order =
- ctx->mVidOv[mDpy]->isModeOn()?ovutils::ZORDER_1:ovutils::ZORDER_0;
- ovutils::eIsFg is_fg =
- ctx->mVidOv[mDpy]->isModeOn()? ovutils::IS_FG_OFF:ovutils::IS_FG_SET;
+ ovutils::eZorder zOrder = static_cast<ovutils::eZorder>(fbZorder);
ovutils::PipeArgs parg(mdpFlags,
- info,
- z_order,
- is_fg,
- ovutils::ROT_FLAGS_NONE);
+ info,
+ zOrder,
+ ovutils::IS_FG_OFF,
+ ovutils::ROT_FLAGS_NONE);
ov.setSource(parg, dest);
hwc_rect_t sourceCrop;
getNonWormholeRegion(list, sourceCrop);
// x,y,w,h
ovutils::Dim dcrop(sourceCrop.left, sourceCrop.top,
- sourceCrop.right - sourceCrop.left,
- sourceCrop.bottom - sourceCrop.top);
+ sourceCrop.right - sourceCrop.left,
+ sourceCrop.bottom - sourceCrop.top);
ov.setCrop(dcrop, dest);
int transform = layer->transform;
ovutils::eTransform orient =
- static_cast<ovutils::eTransform>(transform);
+ static_cast<ovutils::eTransform>(transform);
ov.setTransform(orient, dest);
hwc_rect_t displayFrame = sourceCrop;
ovutils::Dim dpos(displayFrame.left,
- displayFrame.top,
- displayFrame.right - displayFrame.left,
- displayFrame.bottom - displayFrame.top);
+ displayFrame.top,
+ displayFrame.right - displayFrame.left,
+ displayFrame.bottom - displayFrame.top);
// Calculate the actionsafe dimensions for External(dpy = 1 or 2)
if(mDpy)
getActionSafePosition(ctx, mDpy, dpos.x, dpos.y, dpos.w, dpos.h);
@@ -167,34 +142,28 @@
mDestRight = ovutils::OV_INVALID;
}
-bool FBUpdateHighRes::prepare(hwc_context_t *ctx, hwc_display_contents_1 *list)
-{
+bool FBUpdateHighRes::prepare(hwc_context_t *ctx, hwc_display_contents_1 *list,
+ int fbZorder) {
if(!ctx->mMDP.hasOverlay) {
ALOGD_IF(DEBUG_FBUPDATE, "%s, this hw doesnt support overlays",
- __FUNCTION__);
- return false;
+ __FUNCTION__);
+ return false;
}
ALOGD_IF(DEBUG_FBUPDATE, "%s, mModeOn = %d", __FUNCTION__, mModeOn);
- mModeOn = configure(ctx, list);
+ mModeOn = configure(ctx, list, fbZorder);
return mModeOn;
}
// Configure
bool FBUpdateHighRes::configure(hwc_context_t *ctx,
- hwc_display_contents_1 *list)
-{
+ hwc_display_contents_1 *list, int fbZorder) {
bool ret = false;
hwc_layer_1_t *layer = &list->hwLayers[list->numHwLayers - 1];
if (LIKELY(ctx->mOverlay)) {
- // When Video overlay is in use and there are no UI layers to
- // be composed to FB , no need to configure FbUpdate.
- if(!needFbUpdate(ctx, list, mDpy))
- return false;
-
overlay::Overlay& ov = *(ctx->mOverlay);
private_handle_t *hnd = (private_handle_t *)layer->handle;
ovutils::Whf info(hnd->width, hnd->height,
- ovutils::getMdpFormat(hnd->format), hnd->size);
+ ovutils::getMdpFormat(hnd->format), hnd->size);
//Request left RGB pipe
ovutils::eDest destL = ov.nextPipe(ovutils::OV_MDP_PIPE_RGB, mDpy);
@@ -210,49 +179,42 @@
mDestLeft = destL;
mDestRight = destR;
- ovutils::eMdpFlags mdpFlagsL = ovutils::OV_MDP_FLAGS_NONE;
- //If any layer has pre-multiplied alpha, set Pre multiplied
- //Flag as the compositied output is alpha pre-multiplied.
- if(ctx->listStats[mDpy].preMultipliedAlpha == true)
- ovutils::setMdpFlags(mdpFlagsL, ovutils::OV_MDP_BLEND_FG_PREMULT);
+ ovutils::eMdpFlags mdpFlagsL = ovutils::OV_MDP_BLEND_FG_PREMULT;
- ovutils::eZorder z_order =
- ctx->mVidOv[mDpy]->isModeOn()?ovutils::ZORDER_1:ovutils::ZORDER_0;
- ovutils::eIsFg is_fg =
- ctx->mVidOv[mDpy]->isModeOn()? ovutils::IS_FG_OFF:ovutils::IS_FG_SET;
+ ovutils::eZorder zOrder = static_cast<ovutils::eZorder>(fbZorder);
ovutils::PipeArgs pargL(mdpFlagsL,
- info,
- z_order,
- is_fg,
- ovutils::ROT_FLAGS_NONE);
+ info,
+ zOrder,
+ ovutils::IS_FG_OFF,
+ ovutils::ROT_FLAGS_NONE);
ov.setSource(pargL, destL);
ovutils::eMdpFlags mdpFlagsR = mdpFlagsL;
ovutils::setMdpFlags(mdpFlagsR, ovutils::OV_MDSS_MDP_RIGHT_MIXER);
ovutils::PipeArgs pargR(mdpFlagsR,
- info,
- z_order,
- is_fg,
- ovutils::ROT_FLAGS_NONE);
+ info,
+ zOrder,
+ ovutils::IS_FG_OFF,
+ ovutils::ROT_FLAGS_NONE);
ov.setSource(pargR, destR);
hwc_rect_t sourceCrop;
getNonWormholeRegion(list, sourceCrop);
ovutils::Dim dcropL(sourceCrop.left, sourceCrop.top,
- (sourceCrop.right - sourceCrop.left) / 2,
- sourceCrop.bottom - sourceCrop.top);
+ (sourceCrop.right - sourceCrop.left) / 2,
+ sourceCrop.bottom - sourceCrop.top);
ovutils::Dim dcropR(
- sourceCrop.left + (sourceCrop.right - sourceCrop.left) / 2,
- sourceCrop.top,
- (sourceCrop.right - sourceCrop.left) / 2,
- sourceCrop.bottom - sourceCrop.top);
+ sourceCrop.left + (sourceCrop.right - sourceCrop.left) / 2,
+ sourceCrop.top,
+ (sourceCrop.right - sourceCrop.left) / 2,
+ sourceCrop.bottom - sourceCrop.top);
ov.setCrop(dcropL, destL);
ov.setCrop(dcropR, destR);
int transform = layer->transform;
ovutils::eTransform orient =
- static_cast<ovutils::eTransform>(transform);
+ static_cast<ovutils::eTransform>(transform);
ov.setTransform(orient, destL);
ov.setTransform(orient, destR);
@@ -260,14 +222,14 @@
//For FB left, top will always be 0
//That should also be the case if using 2 mixers for single display
ovutils::Dim dposL(displayFrame.left,
- displayFrame.top,
- (displayFrame.right - displayFrame.left) / 2,
- displayFrame.bottom - displayFrame.top);
+ displayFrame.top,
+ (displayFrame.right - displayFrame.left) / 2,
+ displayFrame.bottom - displayFrame.top);
ov.setPosition(dposL, destL);
ovutils::Dim dposR(0,
- displayFrame.top,
- (displayFrame.right - displayFrame.left) / 2,
- displayFrame.bottom - displayFrame.top);
+ displayFrame.top,
+ (displayFrame.right - displayFrame.left) / 2,
+ displayFrame.bottom - displayFrame.top);
ov.setPosition(dposR, destR);
ret = true;
@@ -294,12 +256,12 @@
ovutils::eDest destR = mDestRight;
if (!ov.queueBuffer(hnd->fd, hnd->offset, destL)) {
ALOGE("%s: queue failed for left of dpy = %d",
- __FUNCTION__, mDpy);
+ __FUNCTION__, mDpy);
ret = false;
}
if (!ov.queueBuffer(hnd->fd, hnd->offset, destR)) {
ALOGE("%s: queue failed for right of dpy = %d",
- __FUNCTION__, mDpy);
+ __FUNCTION__, mDpy);
ret = false;
}
return ret;