Revert "hwc: Perform MDP downscaling for WFD/HDMI Scenario"
This reverts commit 1291675ee44cadc234c4403cf1b0cfe70eadaf3a.
diff --git a/libhwcomposer/hwc_fbupdate.cpp b/libhwcomposer/hwc_fbupdate.cpp
index 7c2e643..b5ac2b8 100644
--- a/libhwcomposer/hwc_fbupdate.cpp
+++ b/libhwcomposer/hwc_fbupdate.cpp
@@ -26,12 +26,10 @@
#include "hwc_fbupdate.h"
#include "mdp_version.h"
#include "external.h"
-#include "virtual.h"
using namespace qdutils;
using namespace overlay;
using overlay::Rotator;
-using namespace overlay::utils;
namespace qhwc {
@@ -120,32 +118,27 @@
// Do not use getNonWormholeRegion() function to calculate the
// sourceCrop during animation on external display and
// Dont do wormhole calculation when extorientation is set on External
- // Dont do wormhole calculation when extDownscale is enabled on External
if(ctx->listStats[mDpy].isDisplayAnimating && mDpy) {
sourceCrop = layer->displayFrame;
displayFrame = sourceCrop;
- } else if((!mDpy ||
- (mDpy && !ctx->mExtOrientation
- && !ctx->dpyAttr[mDpy].mDownScaleMode))
- && (extOnlyLayerIndex == -1)) {
+ } else if((!mDpy || (mDpy && !ctx->mExtOrientation))
+ && extOnlyLayerIndex == -1) {
if(!qdutils::MDPVersion::getInstance().is8x26()) {
getNonWormholeRegion(list, sourceCrop);
displayFrame = sourceCrop;
}
}
+
if(mDpy && !qdutils::MDPVersion::getInstance().is8x26()) {
- if(ctx->mExtOrientation || ctx->dpyAttr[mDpy].mDownScaleMode) {
- calcExtDisplayPosition(ctx, mDpy, sourceCrop, displayFrame);
+ if(ctx->mExtOrientation) {
+ calcExtDisplayPosition(ctx, mDpy, displayFrame);
// If there is a external orientation set, use that
- if(ctx->mExtOrientation) {
- transform = ctx->mExtOrientation;
- orient =
- static_cast<ovutils::eTransform >(ctx->mExtOrientation);
- }
+ transform = ctx->mExtOrientation;
+ orient = static_cast<ovutils::eTransform >(ctx->mExtOrientation);
}
// Calculate the actionsafe dimensions for External(dpy = 1 or 2)
getActionSafePosition(ctx, mDpy, displayFrame);
- }
+ }
setMdpFlags(layer, mdpFlags, 0, transform);
// For External use rotator if there is a rotation value set
if(mDpy && (ctx->mExtOrientation & HWC_TRANSFORM_ROT_90)) {