fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
Fix the last merge fix, had the blocks ordered incorrectly.
(cherry picked from commit e57e398960)
This commit is contained in:
Jesse Barnes 2009-01-23 13:18:13 -08:00 • committed by Ian Romanick
parent 1cd7317fdb
commit 75ecd6ebbf
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mesa/drivers/dri/intel/intel_buffers.c
View file

@ -166,14 +166,6 @@ intelFixupVblank(struct intel_context *intel, __DRIdrawablePrivate *dPriv)
GLint areaB = driIntersectArea( drw_rect, planeB_rect ); GLint areaB = driIntersectArea( drw_rect, planeB_rect );
GLuint flags = dPriv->vblFlags; 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 /* Update vblank info
*/ */
if (areaB > areaA || (areaA == areaB && areaB > 0)) { if (areaB > areaA || (areaA == areaB && areaB > 0)) {
@ -182,6 +174,14 @@ intelFixupVblank(struct intel_context *intel, __DRIdrawablePrivate *dPriv)
flags = dPriv->vblFlags & ~VBLANK_FLAG_SECONDARY; 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; return flags;
} else { } else {
return dPriv->vblFlags & ~VBLANK_FLAG_SECONDARY; return dPriv->vblFlags & ~VBLANK_FLAG_SECONDARY;