summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Tasayco Loarte <victorx.tasayco.loarte@intel.com>2016-05-23 19:47:48 +0800
committerAndriy Naborskyy <andriyn@google.com>2016-06-02 07:25:52 -0700
commita174f45487c170ca5e229ed0b8423cccd4819264 (patch)
treed8dfd484c3ea3ac996fc8fa038e2cf42be2b67c9
parenta130370d8aed35814cb595e35420bd799e9e75fa (diff)
downloadhwcomposer-a174f45487c170ca5e229ed0b8423cccd4819264.tar.gz
display: re-implement assignToDevice method
1. Re-implement assignToDevice method for TngPrimaryPlane class to get plane ModeInfo. 2. Remove the formula to calculate screen position when rotation is enabled, since the calculation method of screen position should be same no matter whether rotation feature is enabled or not. Change-Id: I1e265fa149c2559a90448693bdf563ebcb1af72f Tracked-On: https://jira01.devtools.intel.com/browse/AW-690 Signed-off-by: wenshelx <wenshengx.wang@intel.com>
-rw-r--r--merrifield/ips/tangier/TngPrimaryPlane.cpp1
-rw-r--r--merrifield/ips/tangier/TngSpritePlane.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/merrifield/ips/tangier/TngPrimaryPlane.cpp b/merrifield/ips/tangier/TngPrimaryPlane.cpp
index cfa1406..e811a3b 100644
--- a/merrifield/ips/tangier/TngPrimaryPlane.cpp
+++ b/merrifield/ips/tangier/TngPrimaryPlane.cpp
@@ -167,6 +167,7 @@ void TngPrimaryPlane::setZOrderConfig(ZOrderConfig& zorderConfig,
bool TngPrimaryPlane::assignToDevice(int disp)
{
+ DisplayPlane::assignToDevice(disp);
return true;
}
diff --git a/merrifield/ips/tangier/TngSpritePlane.cpp b/merrifield/ips/tangier/TngSpritePlane.cpp
index 8e5a7f1..0571283 100644
--- a/merrifield/ips/tangier/TngSpritePlane.cpp
+++ b/merrifield/ips/tangier/TngSpritePlane.cpp
@@ -66,8 +66,6 @@ bool TngSpritePlane::setDataBuffer(BufferMapper& mapper)
stride = mapper.getStride().rgb.stride;
#ifdef ENABLE_ROTATION_180
linoff = (mapper.getCrop().h + srcY - 1) * stride + (srcX + mapper.getCrop().w) * bpp;
- dstX = dstW - (srcX + mapper.getCrop().w);
- dstY = dstH - (srcY + mapper.getCrop().h);
#else
linoff = srcY * stride + srcX * bpp;
#endif