commit af5f5971d44ac4207ed9adb62696d3a8774e78ca
author Saurabh Shah <saurshah@codeaurora.org> Tue Jul 30 13:56:35 2013 -0700
committer Saurabh Shah <saurshah@codeaurora.org> Thu Aug 01 11:07:32 2013 -0700
tree 405e54c710e6e6aa1b7d8efb5c8a6d5e9688c36d
parent c93fb75567bc90fcd66f05e7d609a34a179ebf9d

hwc/overlay: Prevent pipes from switching mixers

For split displays, earlier we allowed pipes to switch mixers in
subsequent rounds. This change prevents that and makes sure there
is one composition round where a pipe being transferred to another
mixer of the same display is UNSET

Change-Id: I3c679cc4256363eeb70c5cf8bcaf5047b8a064c2

libhwcomposer/hwc_fbupdate.cpp

diff --git a/libhwcomposer/hwc_fbupdate.cpp b/libhwcomposer/hwc_fbupdate.cpp
index 7fb5b46..86e3e66 100644
--- a/libhwcomposer/hwc_fbupdate.cpp
+++ b/libhwcomposer/hwc_fbupdate.cpp
@@ -21,13 +21,14 @@
 #define DEBUG_FBUPDATE 0
 #include <cutils/properties.h>
 #include <gralloc_priv.h>
+#include <overlay.h>
 #include <overlayRotator.h>
 #include "hwc_fbupdate.h"
 #include "mdp_version.h"
 #include "external.h"
 
 using namespace qdutils;
-
+using namespace overlay;
 using overlay::Rotator;
 
 namespace qhwc {
@@ -89,7 +90,7 @@
             //For 8x26 external always use DMA pipe
             type = ovutils::OV_MDP_PIPE_DMA;
         }
-        ovutils::eDest dest = ov.nextPipe(type, mDpy);
+        ovutils::eDest dest = ov.nextPipe(type, mDpy, Overlay::MIXER_DEFAULT);
         if(dest == ovutils::OV_INVALID) { //None available
             ALOGE("%s: No pipes available to configure fb for dpy %d",
                 __FUNCTION__, mDpy);
@@ -244,14 +245,16 @@
                           ovutils::getMdpFormat(hnd->format), hnd->size);
 
         //Request left pipe
-        ovutils::eDest destL = ov.nextPipe(ovutils::OV_MDP_PIPE_ANY, mDpy);
+        ovutils::eDest destL = ov.nextPipe(ovutils::OV_MDP_PIPE_ANY, mDpy,
+                Overlay::MIXER_LEFT);
         if(destL == ovutils::OV_INVALID) { //None available
             ALOGE("%s: No pipes available to configure fb for dpy %d's left"
                     " mixer", __FUNCTION__, mDpy);
             return false;
         }
         //Request right pipe
-        ovutils::eDest destR = ov.nextPipe(ovutils::OV_MDP_PIPE_ANY, mDpy);
+        ovutils::eDest destR = ov.nextPipe(ovutils::OV_MDP_PIPE_ANY, mDpy,
+                Overlay::MIXER_RIGHT);
         if(destR == ovutils::OV_INVALID) { //None available
             ALOGE("%s: No pipes available to configure fb for dpy %d's right"
                     " mixer", __FUNCTION__, mDpy);