Author: branden
Date: 2004-03-26 17:51:05 -0500 (Fri, 26 Mar 2004)
New Revision: 1193
Added:
trunk/debian/patches/079_radeon_resume_fix.diff
Modified:
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/patches/099_ati_recognize_more_RV280_models.diff
Log:
Apply patch by Emmanuel Thom?\195?\169 and Ole Rohne to enable resume from
suspend
level S3 on Dell D600 and D800 laptops; when the VT is re-entered, the
Radeon chipset's memory size is queried, and if zero is returned, the
chipset is re-POSTed via the int10 interface. (Closes: #234575)
Adjust patch offset in
debian/patches/099_ati_recognize_more_RV280_models.diff.
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-03-26 21:20:03 UTC (rev 1192)
+++ trunk/debian/TODO 2004-03-26 22:51:05 UTC (rev 1193)
@@ -66,8 +66,6 @@
05:17PM|<stockholm> Overfiend: I swear upon the suckery tentacle of foulest
demon spawn that the IsolateBus patch doesn't break anything for people who
don't use it!
-* #234575: xserver-xfree86: Xfree 4.3.0-3 + radeon 9000 mobility (M9) + acpi =
- no picture after S3; look into the patch in this report
* Add FAQ items:
+ How do I debug crashes in X clients?
+ How do I debug crashes in the XFree86 X server?
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-03-26 21:20:03 UTC (rev 1192)
+++ trunk/debian/changelog 2004-03-26 22:51:05 UTC (rev 1193)
@@ -75,8 +75,13 @@
Jarc. [Marc Aurele La France]
+ Fix a crash when xkb is disabled. [Matthieu Herrb] (Closes: #238407)
- -- Branden Robinson <[EMAIL PROTECTED]> Fri, 26 Mar 2004 15:53:39 -0500
+ * Apply patch by Emmanuel Thomé and Ole Rohne to enable resume from suspend
+ level S3 on Dell D600 and D800 laptops; when the VT is re-entered, the
+ Radeon chipset's memory size is queried, and if zero is returned, the
+ chipset is re-POSTed via the int10 interface. (Closes: #234575)
+ -- Branden Robinson <[EMAIL PROTECTED]> Fri, 26 Mar 2004 17:47:47 -0500
+
xfree86 (4.3.0-7) unstable; urgency=medium
* Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
Added: trunk/debian/patches/079_radeon_resume_fix.diff
===================================================================
--- trunk/debian/patches/079_radeon_resume_fix.diff 2004-03-26 21:20:03 UTC
(rev 1192)
+++ trunk/debian/patches/079_radeon_resume_fix.diff 2004-03-26 22:51:05 UTC
(rev 1193)
@@ -0,0 +1,43 @@
+$Id$
+
+This enables resume from suspend level S3 by asking the Radeon chip if it
+thinks it has no memory. If so, the card is re-POSTed via the int10
+interface. Reportedly enables the driver to work for this type of
+suspend/resume cycle on Dell D600 laptops (Dell D800s as well, if the video
+BIOS is patched to 4.28.20.31.C1 or later). See Debian Bug #234575.
+
+This patch by Emmanuel Thomé and Ole Rohne.
+
+--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c~
2004-03-26 16:31:43.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2004-03-26
16:42:21.000000000 -0500
+@@ -351,6 +351,7 @@
+ "xf86InitInt10",
+ "xf86FreeInt10",
+ "xf86int10Addr",
++ "xf86ExecX86int10",
+ NULL
+ };
+
+@@ -6350,9 +6351,22 @@
+ {
+ ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ RADEONInfoPtr info = RADEONPTR(pScrn);
++ unsigned char *RADEONMMIO = info->MMIO;
+
+ RADEONTRACE(("RADEONEnterVT\n"));
+
++ if (INREG(RADEON_CONFIG_MEMSIZE) == 0) { /* Softboot V_BIOS */
++ xf86Int10InfoPtr pInt;
++ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
++ "zero MEMSIZE, probably at D3cold. Re-POSTing via int10.\n");
++ pInt = xf86InitInt10 (info->pEnt->index);
++ if (pInt) {
++ pInt->num = 0xe6;
++ xf86ExecX86int10 (pInt);
++ xf86FreeInt10 (pInt)
++ }
++ }
++
+ if (info->FBDev) {
+ unsigned char *RADEONMMIO = info->MMIO;
+ if (!fbdevHWEnterVT(scrnIndex,flags)) return FALSE;
Property changes on: trunk/debian/patches/079_radeon_resume_fix.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/patches/099_ati_recognize_more_RV280_models.diff
===================================================================
--- trunk/debian/patches/099_ati_recognize_more_RV280_models.diff
2004-03-26 21:20:03 UTC (rev 1192)
+++ trunk/debian/patches/099_ati_recognize_more_RV280_models.diff
2004-03-26 22:51:05 UTC (rev 1193)
@@ -47,7 +47,7 @@
diff -urN xc.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
--- xc.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
2004-01-14 13:19:19.000000000 +1100
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2004-01-14
18:10:19.000000000 +1100
-@@ -1992,10 +1992,14 @@
+@@ -1993,10 +1993,14 @@
info->ChipFamily = CHIP_FAMILY_M9;
break;
