diff -ruN linux-2.4.10.orig/Documentation/Configure.help linux-2.4.10/Documentation/Configure.help --- linux-2.4.10.orig/Documentation/Configure.help Sun Sep 23 19:52:38 2001 +++ linux-2.4.10/Documentation/Configure.help Mon Sep 24 01:26:15 2001 @@ -2531,87 +2531,93 @@ If you have an AGP system and you say Y here, it will be possible to use the AGP features of your 3D rendering video card. This code acts - as a sort of "AGP driver" for the motherboard's chipset. The glx - module will then be able to program the GART (graphics aperture - relocation table) registers with appropriate values to transfer + as a sort of "AGP driver" for the motherboard's chipset. The GLX + module will then be able to program the GART (Graphics Aperture + Relocation Table) registers with appropriate values to transfer commands to the card. - If you need more texture memory than you can get with the AGP GART + If you need more texture memory than you can get with the AGPGART (theoretically up to 256 MB, but in practice usually 64 or 128 MB due to kernel allocation issues), you could use PCI accesses and have up to a couple gigs of texture space. - Note that this is the only means to have XFree4/GLX use + Note that this is the only means to have XFree86/GLX use write-combining with MTRR support on the AGP bus. Without it, OpenGL direct rendering will be a lot slower but still faster than PIO. For the moment, you should probably say N, unless you want to test - the GLX component for XFree86 3.3.6, which can be downloaded from - http://utah-glx.sourceforge.net/ , or need to use the 810 Xserver in - XFree 3.3.6. + the GLX component for XFree86, eg. Utah-GLX for XFree86 3.3.6 or + various GLX components (DRI, nVidia's OpenGL driver, etc) for + XFree86 4.x. + + Utah-GLX: http://utah-glx.sourceforge.net/ + DRI: http://dri.sourceforge.net/ + + This is also required to run an X server for i810 on XFree86. This driver is available as a module. If you want to compile it as a module, say M here and read Documentation/modules.txt. The module will be called agpgart.o. -Intel 440LX/BX/GX/815/840/850 support +Intel support CONFIG_AGP_INTEL This option gives you AGP support for the GLX component of the - XFree86 4.x on Intel 440LX/BX/GX, 815, 840 and 850 chipsets. + XFree86 on Intel 440LX/BX/GX, 815, 840 and 850 chipsets. - For the moment, you should probably say N, unless you want to test - the GLX component for XFree86 3.3.6, which can be downloaded from - http://utah-glx.sourceforge.net/ . + If your chipset isn't listed here, it might still work + via generic setup. If unsure, say N. -Intel I810/I810 DC100/I810e support +Intel 810/815 (on-board) support CONFIG_AGP_I810 - This option gives you AGP support for the Xserver on the Intel 810 - and 815 chipset boards for their on-board integrated graphics. This - is required to do any useful video modes with these boards. + This option gives you AGP support for the GLX component of the + XFree86 on Intel 810 and 815 chipsets. This is also required + to do any useful video modes with their on-board integrated + graphics. -VIA chipset support + If you want to run X on computer with this chipset, say Y. + Otherwise say N. + +VIA support CONFIG_AGP_VIA This option gives you AGP support for the GLX component of the - XFree86 4.x on VIA MPV3/Apollo Pro chipsets. + XFree86 on VIA VP3, MVP3, MVP4, Apollo Pro KX133, KT133 and + KT266 chipsets. - For the moment, you should probably say N, unless you want to test - the GLX component for XFree86 3.3.6, which can be downloaded from - http://utah-glx.sourceforge.net/ . + If your chipset isn't listed here, it might still work + via generic setup. If unsure, say N. -AMD Irongate, 761, and 762 support +AMD support CONFIG_AGP_AMD This option gives you AGP support for the GLX component of the - XFree86 4.x on AMD Irongate, 761, and 762 chipsets. + XFree86 on AMD Irongate, 761, and 762 (760MP) chipsets. - For the moment, you should probably say N, unless you want to test - the GLX component for XFree86 3.3.6, which can be downloaded from - http://utah-glx.sourceforge.net/ . + If your chipset isn't listed here, it might still work + via generic setup. If unsure, say N. -Generic SiS support +SiS support CONFIG_AGP_SIS - This option gives you AGP support for the GLX component of the "soon - to be released" XFree86 4.x on Silicon Integrated Systems [SiS] - chipsets. + This option gives you AGP support for the GLX component of the + XFree86 on Silicon Integrated Systems [SiS] 530, 540, 620, 630 + and 735 chipsets. - Note that 5591/5592 AGP chipsets are NOT supported. + If your chipset isn't listed here, it might still work + via generic setup. If unsure, say N. - For the moment, you should probably say N, unless you want to test - the GLX component for XFree86 3.3.6, which can be downloaded from - http://utah-glx.sourceforge.net/ . + Note that 5591/5592 AGP chipsets are NOT supported. -ALI M1541 support +ALi support CONFIG_AGP_ALI This option gives you AGP support for the GLX component of the - XFree86 4.x on the ALi M1541 chipset. + XFree86 on the ALi M1541, M1621, M1631, M1632, M1641, M1647 + and M1651 chipsets. - This chipset can do AGP 1x and 2x, but note that there is an - acknowledged incompatibility with Matrox G200 cards. Due to - timing issues, this chipset cannot do AGP 2x with the G200. - This is a hardware limitation. AGP 1x seems to be fine, though. + The M1541 chipset can do AGP 1x and 2x, but note that there is an + acknowledged incompatibility with Matrox G200 cards. Due to timing + issues, this chipset cannot do AGP 2x with the G200. This is a + hardware limitation. AGP 1x seems to be fine, though. - For the moment, you should probably say N, unless you want to test - the GLX component for XFree86 3.3.6, which can be downloaded from - http://utah-glx.sourceforge.net/ . + If your chipset isn't listed here, it might still work + via generic setup. If unsure, say N. PCI support CONFIG_PCI @@ -3400,8 +3406,7 @@ CONFIG_FB_COMPAT_XPMAC If you use the Xpmac X server (common with mklinux), you'll need to say Y here to use X. You should consider changing to XFree86 which - includes a server that supports the frame buffer device directly - (XF68_FBDev). + includes a server that supports the frame buffer device directly. HGA monochrome support (EXPERIMENTAL) CONFIG_FB_HGA @@ -3507,11 +3512,11 @@ Say Y or M here if you want to use a secondary head (meaning two monitors in parallel) on G400 or MGA-TVO add-on on G200. Secondary - head is not compatible with accelerated XFree 3.3.x SVGA servers - - secondary head output is blanked while you are in X. With XFree - 3.9.17 preview you can use both heads if you use SVGA over fbdev or - the fbdev driver on first head and the fbdev driver on second head. - + head is not compatible with accelerated XFree86 3.3.x SVGA servers - + secondary head output is blanked while you are in X. With any recent + versions of XFree86, you can use both heads if you use mga driver + over fbdev or the fbdev driver on both heads. + If you compile it as module, two modules are created, matroxfb_crtc2.o and matroxfb_maven.o. Matroxfb_maven is needed for both G200 and G400, matroxfb_crtc2 is needed only by G400. You must diff -ruN linux-2.4.10.orig/drivers/char/Config.in linux-2.4.10/drivers/char/Config.in --- linux-2.4.10.orig/drivers/char/Config.in Sun Sep 23 19:52:38 2001 +++ linux-2.4.10/drivers/char/Config.in Mon Sep 24 01:22:12 2001 @@ -205,12 +205,12 @@ dep_tristate '/dev/agpgart (AGP Support)' CONFIG_AGP $CONFIG_DRM_AGP if [ "$CONFIG_AGP" != "n" ]; then - bool ' Intel 440LX/BX/GX and I815/I840/I850 support' CONFIG_AGP_INTEL - bool ' Intel I810/I815 (on-board) support' CONFIG_AGP_I810 - bool ' VIA chipset support' CONFIG_AGP_VIA - bool ' AMD Irongate, 761, and 762 support' CONFIG_AGP_AMD - bool ' Generic SiS support' CONFIG_AGP_SIS - bool ' ALI chipset support' CONFIG_AGP_ALI + bool ' Intel support' CONFIG_AGP_INTEL + bool ' Intel 810/815 (on-board) support' CONFIG_AGP_I810 + bool ' VIA support' CONFIG_AGP_VIA + bool ' AMD support' CONFIG_AGP_AMD + bool ' SiS support' CONFIG_AGP_SIS + bool ' ALi support' CONFIG_AGP_ALI bool ' Serverworks LE/HE support' CONFIG_AGP_SWORKS fi