summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Tasayco Loarte <victorx.tasayco.loarte@intel.com>2016-06-08 01:30:45 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-08 01:30:45 +0000
commit923a0cfa8427d15d4e426e89ed562bc7b075dac3 (patch)
tree1c57449003cbb9c64d6a2f193562d97092ec3c35
parentfa2d92eb5287323d22ce009469059d77222df83a (diff)
parent32a86332b1afe6494d83026992daaab85680492f (diff)
downloadhwcomposer-923a0cfa8427d15d4e426e89ed562bc7b075dac3.tar.gz
display: re-implement assignToDevice method am: a174f45487 am: 179758ea06
am: 32a86332b1 Change-Id: I44a0296149453b68fea7a4e550fa98aeec8d21fb
-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