Author: branden
Date: 2004-08-12 17:38:58 -0500 (Thu, 12 Aug 2004)
New Revision: 1734
Added:
trunk/debian/patches/000_stolen_from_freedesktop.org.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/patches/044_chips_default_to_noaccel_on_69k.diff
trunk/debian/patches/045_chips_default_to_swcursor_on_69k.diff
Log:
Grab from freedesktop.org CVS a fix for SEGVs in the chips driver when the
current mode wasn't valid. Thanks to Ryan Underwood for identifying and
testing this fix. Resync patches #044 and #045. (Closes: #260753)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-08-12 21:35:05 UTC (rev 1733)
+++ trunk/debian/CHANGESETS 2004-08-12 22:38:58 UTC (rev 1734)
@@ -362,4 +362,9 @@
defaults file. (Closes: #252274)
1733
+Grab from freedesktop.org CVS a fix for SEGVs in the chips driver when the
+current mode wasn't valid. Thanks to Ryan Underwood for identifying and
+testing this fix. Resync patches #044 and #045. (Closes: #260753)
+ 1734
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-08-12 21:35:05 UTC (rev 1733)
+++ trunk/debian/TODO 2004-08-12 22:38:58 UTC (rev 1734)
@@ -60,6 +60,8 @@
+ #259080: xserver-xfree86: [debconf] specialized mouse defaults for Hurd
[BR]
+ #261777: Problems handling multiple detected video cards; see what can be
done about this [BR]
+ + #257515: xserver-xfree86: [debconf] keyboard layout template should tell
U.K.
+ users to use 'gb' [BR]
* Add FAQ entry describing Debian's plans in the X department.
* #256706: keep swatting away at the keyboard modifer issue; Ivan Pascal told
BR:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-08-12 21:35:05 UTC (rev 1733)
+++ trunk/debian/changelog 2004-08-12 22:38:58 UTC (rev 1734)
@@ -275,6 +275,10 @@
* Fix wrong comment character in Debian customizations to XTerm application
defaults file. (Closes: #252274)
+ * Grab from freedesktop.org CVS a fix for SEGVs in the chips driver when the
+ current mode wasn't valid. Thanks to Ryan Underwood for identifying and
+ testing this fix. Resync patches #044 and #045. (Closes: #260753)
+
Changes by Fabio M. Di Nitto and Branden Robinson:
* Support building only the parts of the source tree needed by
@@ -316,7 +320,7 @@
autodetection would cause the script to think it had detected one X server
or XFree86 video driver instead ($(echo "" | wc -l) is "1", not "0").
- -- Branden Robinson <[EMAIL PROTECTED]> Thu, 12 Aug 2004 16:27:28 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Thu, 12 Aug 2004 17:35:50 -0500
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Added: trunk/debian/patches/000_stolen_from_freedesktop.org.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_freedesktop.org.diff 2004-08-12
21:35:05 UTC (rev 1733)
+++ trunk/debian/patches/000_stolen_from_freedesktop.org.diff 2004-08-12
22:38:58 UTC (rev 1734)
@@ -0,0 +1,98 @@
+$Id$
+
+xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c @ 1.3
+ * programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c:
+ (chipsClockSelect), (chipsClockFind), (chipsModeInitHiQV),
+ (chipsModeInitWingine), (chipsModeInit655xx):
+ Fixed Segfault on video mode switching when pScrn->currentMode did
+ not contain a valid mode.
+2004-05-24 Egbert Eich <[EMAIL PROTECTED]>
+
+--- xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c~ 2004-08-12
17:30:47.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c 2004-08-12
17:30:51.000000000 -0500
+@@ -158,7 +158,8 @@
+ static void chipsUnlock(ScrnInfoPtr pScrn);
+ static void chipsClockSave(ScrnInfoPtr pScrn, CHIPSClockPtr Clock);
+ static void chipsClockLoad(ScrnInfoPtr pScrn, CHIPSClockPtr Clock);
+-static Bool chipsClockFind(ScrnInfoPtr pScrn, int no, CHIPSClockPtr
Clock);
++static Bool chipsClockFind(ScrnInfoPtr pScrn, DisplayModePtr mode,
++ int no, CHIPSClockPtr Clock);
+ static void chipsCalcClock(ScrnInfoPtr pScrn, int Clock,
+ unsigned char *vclk);
+ static int chipsGetHWClock(ScrnInfoPtr pScrn);
+@@ -4689,7 +4690,7 @@
+ break;
+
+ default:
+- if (!chipsClockFind(pScrn, no, &TmpClock))
++ if (!chipsClockFind(pScrn, NULL, no, &TmpClock))
+ return (FALSE);
+ chipsClockLoad(pScrn, &TmpClock);
+ }
+@@ -4770,7 +4771,8 @@
+ }
+
+ static Bool
+-chipsClockFind(ScrnInfoPtr pScrn, int no, CHIPSClockPtr Clock)
++chipsClockFind(ScrnInfoPtr pScrn, DisplayModePtr mode,
++ int no, CHIPSClockPtr Clock )
+ {
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
+ CHIPSPtr cPtr = CHIPSPTR(pScrn);
+@@ -4790,9 +4792,9 @@
+ case HiQV_STYLE:
+ Clock->msr = cPtr->CRTclkInx << 2;
+ Clock->fr03 = cPtr->FPclkInx << 2;
+- Clock->Clock = pScrn->currentMode->Clock;
++ Clock->Clock = mode ? mode->Clock : 0;
+ if (xf86ReturnOptValBool(cPtr->Options, OPTION_USE_MODELINE, FALSE)) {
+- Clock->FPClock = pScrn->currentMode->Clock;
++ Clock->FPClock = mode ? mode->Clock : 0;
+ } else
+ Clock->FPClock = cPtr->FPclock;
+ break;
+@@ -4831,7 +4833,7 @@
+ if ((cPtr->PanelType & ChipsLCD) && cPtr->FPclock)
+ Clock->Clock = cPtr->FPclock;
+ else
+- Clock->Clock = pScrn->currentMode->SynthClock;
++ Clock->Clock = mode ? mode->SynthClock : 0;
+ }
+ break;
+ case OLD_STYLE:
+@@ -4856,7 +4858,7 @@
+ } else {
+ Clock->msr = 3 << 2;
+ Clock->xr33 = 0;
+- Clock->Clock = pScrn->currentMode->SynthClock;
++ Clock->Clock = mode ? mode->SynthClock : 0;
+ }
+ break;
+ }
+@@ -5369,7 +5371,7 @@
+ pScrn->vtSema = TRUE;
+
+ /* init clock */
+- if (!chipsClockFind(pScrn, mode->ClockIndex, &ChipsNew->Clock)) {
++ if (!chipsClockFind(pScrn, mode, mode->ClockIndex, &ChipsNew->Clock)) {
+ ErrorF("bomb 2\n");
+ return (FALSE);
+ }
+@@ -5972,7 +5974,7 @@
+ pScrn->vtSema = TRUE;
+
+ /* init clock */
+- if (!chipsClockFind(pScrn, mode->ClockIndex, &ChipsNew->Clock)) {
++ if (!chipsClockFind(pScrn, mode, mode->ClockIndex, &ChipsNew->Clock)) {
+ ErrorF("bomb 4\n");
+ return (FALSE);
+ }
+@@ -6214,7 +6216,7 @@
+ pScrn->vtSema = TRUE;
+
+ /* init clock */
+- if (!chipsClockFind(pScrn, mode->ClockIndex, &ChipsNew->Clock)) {
++ if (!chipsClockFind(pScrn, mode, mode->ClockIndex, &ChipsNew->Clock)) {
+ ErrorF("bomb 6\n");
+ return (FALSE);
+ }
Property changes on: trunk/debian/patches/000_stolen_from_freedesktop.org.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/patches/044_chips_default_to_noaccel_on_69k.diff
===================================================================
--- trunk/debian/patches/044_chips_default_to_noaccel_on_69k.diff
2004-08-12 21:35:05 UTC (rev 1733)
+++ trunk/debian/patches/044_chips_default_to_noaccel_on_69k.diff
2004-08-12 22:38:58 UTC (rev 1734)
@@ -2,9 +2,9 @@
This patch from Mike A. Harris.
---- xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c.chips-noaccel
2002-11-25 09:04:58.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c 2003-02-04
22:40:12.000000000 -0500
-@@ -1487,6 +1487,20 @@
+--- xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c~ 2004-08-12
17:31:16.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c 2004-08-12
17:31:21.000000000 -0500
+@@ -1488,6 +1488,20 @@
"rgb bits %d\n", val);
}
}
Modified: trunk/debian/patches/045_chips_default_to_swcursor_on_69k.diff
===================================================================
--- trunk/debian/patches/045_chips_default_to_swcursor_on_69k.diff
2004-08-12 21:35:05 UTC (rev 1733)
+++ trunk/debian/patches/045_chips_default_to_swcursor_on_69k.diff
2004-08-12 22:38:58 UTC (rev 1734)
@@ -2,9 +2,9 @@
This patch from Mike A. Harris.
----
xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c.chips-default-to-swcursor-on-65550
2003-02-04 21:16:31.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c 2003-02-04
21:43:32.000000000 -0500
-@@ -1514,6 +1514,18 @@
+--- xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c~ 2004-08-12
17:31:33.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c 2004-08-12
17:31:41.000000000 -0500
+@@ -1515,6 +1515,18 @@
} else {
cPtr->Accel.UseHWCursor = TRUE;
}
