diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:35:23 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:35:23 +0000 |
| commit | 42cbea1d05a9e44b0d560da29bff19711ebb8a94 (patch) | |
| tree | 4b4ac0ed48b0c0f4854fc7e090e015ea3d2bee13 /src/atipreinit.c | |
| parent | 0779e46ecd01e3f0e413cedfff6df7b3b70618c2 (diff) | |
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
Diffstat (limited to 'src/atipreinit.c')
| -rw-r--r-- | src/atipreinit.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/atipreinit.c b/src/atipreinit.c index 0703b08f..a1206ab0 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -1,7 +1,6 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.73 2003/12/15 15:14:56 tsi Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.73 2003/12/15 15:14:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.75 2004/01/05 16:42:03 tsi Exp $ */ /* - * Copyright 1999 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -2218,7 +2217,7 @@ ATIPreInit /* If the mode on entry wasn't stretched, adjust timings */ if (!(pATIHW->horz_stretching & HORZ_STRETCH_EN) && - (pATI->LCDHorizontal > HDisplay)) + (pATI->LCDHorizontal > (int)HDisplay)) { HDisplay = pATI->LCDHorizontal - HDisplay; if (pATI->LCDHSyncStart >= HDisplay) @@ -2232,7 +2231,7 @@ ATIPreInit } if (!(pATIHW->vert_stretching & VERT_STRETCH_EN) && - (pATI->LCDVertical > VDisplay)) + (pATI->LCDVertical > (int)VDisplay)) { VDisplay = pATI->LCDVertical - VDisplay; if (pATI->LCDVSyncStart >= VDisplay) |