31179eebc6
[2] Put the manpages from section 4 under 4x. For example, you can do
"man 4x vga" to get the X vga(4x) manpage, still do man 4 cirrus to get
cirrus(4x), and man -a vga to get both vga manpages.
[3] Apply several important-looking fixes to ATI drivers from the stable branch:
- Fix mode setting with Mach64 on some laptops.
- Don't crash with mach64 for some PCI configurations
- Improve hang detection on r128s. (may improve speed in DRI, too)
- Avoid a hang on server regen on r128 with DRI.
- Fix the DynamicClocks support, which could have caused hangs with DRI on
original Radeons.
PR: [2] ports/25576
Submitted by: [2] fanf
Requested by: [1] peter
Obtained from: [3] XORG-6_8-branch
18 lines
736 B
C
18 lines
736 B
C
Index: programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c
|
|
===================================================================
|
|
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c,v
|
|
retrieving revision 1.3
|
|
retrieving revision 1.3.2.2
|
|
diff -u -u -r1.3 -r1.3.2.2
|
|
--- programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c 30 Jul 2004 20:30:51 -0000 1.3
|
|
+++ programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c 15 Dec 2004 08:47:20 -0000 1.3.2.2
|
|
@@ -1554,6 +1560,9 @@
|
|
continue;
|
|
|
|
pPCI = pVideo->thisCard;
|
|
+ if (pPCI == NULL)
|
|
+ continue;
|
|
+
|
|
PciReg = pciReadLong(pPCI->tag, PCI_REG_USERCONFIG);
|
|
j = PciReg & 0x03U;
|
|
if (j == 0x03U)
|