xserver: Branch 'master'

[Henry Zhao]

 hw/xfree86/common/xf86Mode.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 66702f3c1c6c884e83744c72da173cc32f22b2f4 (from fa877d7ff25c4ec45288e1fea70d4f5e1baf3ef3)
Author: Henry Zhao <henryz at localhost.localdomain>
Date:   Fri Jun 1 23:55:40 2007 -0700

    Need to use minPitch in miScanLineWidth() to get the shrinked
    linePitch.

diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index fc905df..b343788 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -1890,7 +1890,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
 		       virtX, virtY, vx, vy);
 	    virtX = vx;
 	    virtY = vy;
-	    linePitch = miScanLineWidth(vx, vy, linePitch, apertureSize,
+	    linePitch = miScanLineWidth(vx, vy, minPitch, apertureSize,
 					BankFormat, pitchInc);
 	}
     }