xf86-video-intel: Branch 'mergedfb' - src/i830_video.c

[Alan Hourihane]

 src/i830_video.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree a91a4f95c664f6905fef61dab251707bf2548bb8 (from ac3ad32f667b306e771617d784648f7111743f1a)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Thu Jul 27 16:11:48 2006 +0100

    Fix pipe reversal for Xv

diff --git a/src/i830_video.c b/src/i830_video.c
index 762bddf..b252ac9 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -1495,21 +1495,21 @@ I830DisplayVideo(ScrnInfoPtr pScrn, int 
          case PosBelow:
             if ((w2 > 0 && w1 == 0) ||
                 (h2 > 0 && h1 == 0)) {
-               pPriv->pipe = pI830->pipe;
+               pPriv->pipe = !pI830->pipe;
                dstBox->x1 = dstBox2.x1;
                dstBox->y1 = dstBox2.y1;
                dstBox->x2 = dstBox2.x2;
                dstBox->y2 = dstBox2.y2;
             } else 
-               pPriv->pipe = !pI830->pipe;
+               pPriv->pipe = pI830->pipe;
             break;
          case PosLeftOf:
          case PosAbove:
             if ((w1 > 0 && w2 == 0) ||
                 (h1 > 0 && h2 == 0)) { 
-               pPriv->pipe = !pI830->pipe;
-            } else {
                pPriv->pipe = pI830->pipe;
+            } else {
+               pPriv->pipe = !pI830->pipe;
                dstBox->x1 = dstBox2.x1;
                dstBox->y1 = dstBox2.y1;
                dstBox->x2 = dstBox2.x2;