commit 642ce38173e719269e14b839b9c571a9821be913
author Linux Build Service Account <lnxbuild@localhost> Sun Mar 29 10:45:15 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Mar 29 10:45:15 2015 -0700
tree 1ebbfbcbd87a5d132f822606c0881a316ea53489
parent 7b8eb0c66fe4d4ad12cf7438b9830ef072758220
parent 17774c23fdc771cb5e711d7f480457c88f11b66a

Merge "hwc: Reset PTOR information"

libhwcomposer/hwc.cpp

diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp
index df7f160..85e5d1b 100644
--- a/libhwcomposer/hwc.cpp
+++ b/libhwcomposer/hwc.cpp
@@ -222,6 +222,7 @@
             ctx->mLayerRotMap[i]->reset();
     }
 
+    memset(&(ctx->mPtorInfo), 0, sizeof(ctx->mPtorInfo));
     ctx->mAD->reset();
 
 }

libhwcomposer/hwc_mdpcomp.cpp

diff --git a/libhwcomposer/hwc_mdpcomp.cpp b/libhwcomposer/hwc_mdpcomp.cpp
index ad7be76..5572cc4 100644
--- a/libhwcomposer/hwc_mdpcomp.cpp
+++ b/libhwcomposer/hwc_mdpcomp.cpp
@@ -2047,9 +2047,6 @@
             }
         }
     }
-    // reset PTOR
-    if(!mDpy)
-        memset(&(ctx->mPtorInfo), 0, sizeof(ctx->mPtorInfo));
 
     //reset old data
     mCurrentFrame.reset(numLayers);