From 75ecd6ebbf2cea55ec00bd02f2715a7d1d6ce99f Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Fri, 23 Jan 2009 13:18:13 -0800 Subject: [PATCH] intel: fix the mismerge of the vblank pipe enable sanity check Fix the last merge fix, had the blocks ordered incorrectly. (cherry picked from commit e57e39896049a045751201e912779872026fc741) --- src/mesa/drivers/dri/intel/intel_buffers.c | 16 ++++++++-------- 1 file 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 3f572faca2f..5ec5bf1fc22 100644 --- a/src/mesa/drivers/dri/intel/intel_buffers.c +++ b/src/mesa/drivers/dri/intel/intel_buffers.c @@ -166,14 +166,6 @@ 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)) { @@ -182,6 +174,14 @@ intelFixupVblank(struct intel_context *intel, __DRIdrawablePrivate *dPriv) flags = dPriv->vblFlags & ~VBLANK_FLAG_SECONDARY; } + /* 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; + } + return flags; } else { return dPriv->vblFlags & ~VBLANK_FLAG_SECONDARY;