diff options
Diffstat (limited to 'x11-servers/XFree86-4-Server/files/patch-atimobility')
-rw-r--r-- | x11-servers/XFree86-4-Server/files/patch-atimobility | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/x11-servers/XFree86-4-Server/files/patch-atimobility b/x11-servers/XFree86-4-Server/files/patch-atimobility deleted file mode 100644 index b263a250ad5b..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-atimobility +++ /dev/null @@ -1,76 +0,0 @@ -diff -ruN ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c ./programs/Xserver/hw/xfree86/drivers/ati/atimode.c ---- ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c Wed Jan 12 13:01:31 2005 -+++ ./programs/Xserver/hw/xfree86/drivers/ati/atimode.c Fri Feb 4 07:52:01 2005 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.20 2004/12/31 16:07:06 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.20tsi Exp $ */ - /* - * Copyright 2000 through 2005 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org - * -@@ -646,7 +646,7 @@ - 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 -ruN ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c ./programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c ---- ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c Wed Jan 12 13:01:31 2005 -+++ ./programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c Fri Feb 4 07:52:01 2005 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.79 2004/12/31 16:07:06 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.79tsi Exp $ */ - /* - * Copyright 1999 through 2005 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org - * -@@ -1900,10 +1900,10 @@ - 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) | -@@ -2175,7 +2175,7 @@ - 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; -@@ -2191,7 +2191,7 @@ - { - 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 -ruN ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h ./programs/Xserver/hw/xfree86/drivers/ati/atiregs.h ---- ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h Wed Jan 12 13:01:32 2005 -+++ ./programs/Xserver/hw/xfree86/drivers/ati/atiregs.h Fri Feb 4 07:52:01 2005 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.26 2004/12/31 16:07:07 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.26tsi Exp $ */ - /* - * Copyright 1994 through 2005 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org - * -@@ -551,6 +551,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) |