From ea1c22ccde5b665c00dc245b3582cced71084fc9 Mon Sep 17 00:00:00 2001
From: Naomi Luis <nluis@quicinc.com>
Date: Tue, 12 Jul 2011 11:41:19 -0700
Subject: [PATCH] liboverlay: Reset rotation information during updates

When updating the overlay source information, reset the rotation
information as this would be set during the setParameter call.
Also ensure that the HDMI doesn't have any orientation set.

Change-Id: I7a8ae96f27046deeed32f968061cc524d57cbfa3
---
 liboverlay/overlayLib.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/liboverlay/overlayLib.cpp b/liboverlay/overlayLib.cpp
index 7cd6c62..25dd23f 100644
--- a/liboverlay/overlayLib.cpp
+++ b/liboverlay/overlayLib.cpp
@@ -285,10 +285,12 @@ bool Overlay::updateOverlaySource(const overlay_buffer_info& info, int orientati
         return true;
     }
 
+    // Disable rotation for the HDMI channel
+    int orient[2] = {orientation, 0};
     // Set the overlay source info
     for (int i = 0; i < NUM_CHANNELS; i++) {
         if (objOvCtrlChannel[i].isChannelUP()) {
-            ret = objOvCtrlChannel[i].updateOverlaySource(info, orientation);
+            ret = objOvCtrlChannel[i].updateOverlaySource(info, orient[i]);
             if (!ret) {
                 LOGE("objOvCtrlChannel[%d].updateOverlaySource failed", i);
                 return false;
@@ -682,6 +684,7 @@ bool OverlayControlChannel::setOverlayInformation(const overlay_buffer_info& inf
     if (h > mFBHeight)
         mOVInfo.dst_rect.h = mFBHeight;
 
+    mOVInfo.user_data[0] = 0;
     if (requestType == NEW_REQUEST) {
         mOVInfo.id = MSMFB_NEW_REQUEST;
         mOVInfo.z_order = zorder;
@@ -725,9 +728,9 @@ bool OverlayControlChannel::startOVRotatorSessions(
         mRotInfo.dst_y = 0;
         mRotInfo.src_rect.x = 0;
         mRotInfo.src_rect.y = 0;
+        mRotInfo.rotations = 0;
 
         if (requestType == NEW_REQUEST) {
-            mRotInfo.rotations = 0;
             mRotInfo.enable = 0;
             if(mUIChannel)
                mRotInfo.enable = 1;