From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri, 23 Jan 2009 21:18:13 +0000 (-0800)
Subject: intel: fix the mismerge of the vblank pipe enable sanity check
X-Git-Tag: android-x86-1.6~16^2~1556^2~173
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e57e39896049a045751201e912779872026fc741;p=android-x86%2Fexternal-mesa.git

intel: fix the mismerge of the vblank pipe enable sanity check

Fix the last merge fix, had the blocks ordered incorrectly.
---

diff --git a/src/mesa/drivers/dri/intel/intel_buffers.c b/src/mesa/drivers/dri/intel/intel_buffers.c
index 3444e2905f6..f1a08c5c10c 100644
--- a/src/mesa/drivers/dri/intel/intel_buffers.c
+++ b/src/mesa/drivers/dri/intel/intel_buffers.c
@@ -166,19 +166,19 @@ intelFixupVblank(struct intel_context *intel, __DRIdrawablePrivate *dPriv)
       GLint areaB = driIntersectArea( drw_rect, planeB_rect );
       GLuint flags = dPriv->vblFlags;
 
-      /* Do the stupid test: Is one of them actually disabled?
+      /* Update vblank info
        */
-      if (sarea->planeA_w == 0 || sarea->planeA_h == 0) {
+      if (areaB > areaA || (areaA == areaB && areaB > 0)) {
 	 flags = dPriv->vblFlags | VBLANK_FLAG_SECONDARY;
-      } else if (sarea->planeB_w == 0 || sarea->planeB_h == 0) {
+      } else {
 	 flags = dPriv->vblFlags & ~VBLANK_FLAG_SECONDARY;
       }
 
-      /* Update vblank info
+      /* Do the stupid test: Is one of them actually disabled?
        */
-      if (areaB > areaA || (areaA == areaB && areaB > 0)) {
+      if (sarea->planeA_w == 0 || sarea->planeA_h == 0) {
 	 flags = dPriv->vblFlags | VBLANK_FLAG_SECONDARY;
-      } else {
+      } else if (sarea->planeB_w == 0 || sarea->planeB_h == 0) {
 	 flags = dPriv->vblFlags & ~VBLANK_FLAG_SECONDARY;
       }