Mesa (master): intel: move pipe enable sanity check to where it belongs

Jesse Barnes jbarnes at kemper.freedesktop.org
Fri Jan 23 13:14:06 PST 2009


Module: Mesa
Branch: master
Commit: 216bff5fd4699a694a1d76f91c4ee193c2bbe23a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=216bff5fd4699a694a1d76f91c4ee193c2bbe23a

Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Fri Jan 23 13:13:23 2009 -0800

intel: move pipe enable sanity check to where it belongs

Bah, applied the patches in the wrong order, not Owain's fault...

---

 src/mesa/drivers/dri/intel/intel_buffers.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_buffers.c b/src/mesa/drivers/dri/intel/intel_buffers.c
index 81e718b..3444e29 100644
--- a/src/mesa/drivers/dri/intel/intel_buffers.c
+++ b/src/mesa/drivers/dri/intel/intel_buffers.c
@@ -166,6 +166,14 @@ 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?
+       */
+      if (sarea->planeA_w == 0 || sarea->planeA_h == 0) {
+	 flags = dPriv->vblFlags | VBLANK_FLAG_SECONDARY;
+      } else if (sarea->planeB_w == 0 || sarea->planeB_h == 0) {
+	 flags = dPriv->vblFlags & ~VBLANK_FLAG_SECONDARY;
+      }
+
       /* Update vblank info
        */
       if (areaB > areaA || (areaA == areaB && areaB > 0)) {
@@ -195,14 +203,6 @@ intelWindowMoved(struct intel_context *intel)
        intel->intelScreen->driScrnPriv->ddx_version.minor >= 7) {
       GLuint flags = intelFixupVblank(intel, dPriv);
 
-      /* Do the stupid test: Is one of them actually disabled?
-       */
-      if (sarea->planeA_w == 0 || sarea->planeA_h == 0) {
-	 flags = dPriv->vblFlags | VBLANK_FLAG_SECONDARY;
-      } else if (sarea->planeB_w == 0 || sarea->planeB_h == 0) {
-	 flags = dPriv->vblFlags & ~VBLANK_FLAG_SECONDARY;
-      }
-
       /* Check to see if we changed pipes */
       if (flags != dPriv->vblFlags && dPriv->vblFlags &&
 	  !(dPriv->vblFlags & VBLANK_FLAG_NO_IRQ)) {



More information about the mesa-commit mailing list