diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-08-28 18:10:34 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-08-28 18:10:34 +0000 |
| commit | ce0589ff3b9fcf8c6bab64da4dba40ba540a6a03 (patch) | |
| tree | 61cd3777543d60feb21c4436c9334c75887ea484 | |
| parent | 250c8732a54924eeb459880f2905f8e59d038e60 (diff) | |
Bug #1109: Fix VGA init on Rage Mobility 7500 (Marc Le France)
| -rw-r--r-- | src/atimode.c | 3 | ||||
| -rw-r--r-- | src/atipreinit.c | 10 | ||||
| -rw-r--r-- | src/atiregs.h | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/atimode.c b/src/atimode.c index 39e6005c..098659e4 100644 --- a/src/atimode.c +++ b/src/atimode.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.18 2004/01/05 16:42:03 tsi Exp $ */ /* * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * @@ -662,7 +661,7 @@ ATIModeCalculate SetBits(pMode->CrtcVDisplay, CRTC_V_DISP); pATIHW->crtc_v_sync_strt_wid = SetBits(pMode->CrtcVSyncStart, CRTC_V_SYNC_STRT) | - SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_WID); + SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_END_VGA); if (pMode->Flags & V_NVSYNC) pATIHW->crtc_v_sync_strt_wid |= CRTC_V_SYNC_POL; } diff --git a/src/atipreinit.c b/src/atipreinit.c index fa5d50c4..cc45b05b 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -1926,10 +1926,10 @@ ATIPreInit VDisplay = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_DISP); VSyncStart = GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_STRT); - VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_WID)) | - GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_WID); + VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_END_VGA)) | + GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_END_VGA); if (VSyncStart > VSyncEnd) - VSyncEnd += MaxBits(CRTC_V_SYNC_WID) + 1; + VSyncEnd += MaxBits(CRTC_V_SYNC_END_VGA) + 1; VTotal = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_TOTAL); VBlankStart = (VDisplay & ~0x03FFU) | @@ -2201,7 +2201,7 @@ ATIPreInit if ((pATIHW->horz_stretching & (HORZ_STRETCH_EN | AUTO_HORZ_RATIO)) != (HORZ_STRETCH_EN | AUTO_HORZ_RATIO)) - xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, + xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4, "Inconsistent panel horizontal dimension:" " %d and %d.\n", pATI->LCDHorizontal, HDisplay); HDisplay = pATI->LCDHorizontal; @@ -2217,7 +2217,7 @@ ATIPreInit { if (!(pATIHW->vert_stretching & VERT_STRETCH_EN) || !(pATIHW->ext_vert_stretch & AUTO_VERT_RATIO)) - xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, + xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4, "Inconsistent panel vertical dimension: %d and %d.\n", pATI->LCDVertical, VDisplay); VDisplay = pATI->LCDVertical; diff --git a/src/atiregs.h b/src/atiregs.h index 4c35c2b6..f9730c71 100644 --- a/src/atiregs.h +++ b/src/atiregs.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.24 2003/04/23 21:51:30 tsi Exp $ */ /* * Copyright 1994 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * @@ -551,6 +550,7 @@ #define CRTC_V_SYNC_STRT 0x000007fful /* ? 0x0000f800ul */ #define CRTC_V_SYNC_WID 0x001f0000ul +#define CRTC_V_SYNC_END_VGA 0x000f0000ul #define CRTC_V_SYNC_POL 0x00200000ul /* ? 0xffc00000ul */ #define CRTC_VLINE_CRNT_VLINE IOPortTag(0x04u, 0x04u) |