the agp driver for the i810/i815 is designed to support the 810/815's on-board i7xx video. the i815 (which can use on-board video or a seperate AGP 2x/4x/Pro card) does not function with this driver when using a seperate AGP card. the 440LX/BX/GX and 840 agp driver does work, however, if agp_try_unsupported is set to 1 -- they all share the same generic Intel AGP interface, the driver just does not detect the i815. this patch, against 2.4.0-test11-pre5, adds specific support for the 815 to the 440LX/BX/GX/840 driver, so agp_try_unsupported need not be set, and the i815 is detected and handled properly. the patch also updates the configure docs to show that CONFIG_AGP_INTEL now supports the i815, and CONFIG_AGP_I810 supports the i815 when using the on-board video only. ive been using this patch for a couple days with no problem, and agp_try_unsupported=1 for many months ... DRI works great with it. my system is an ASUS CUSL2 with a Matrox G400. -- Robert M. Love [EMAIL PROTECTED] [EMAIL PROTECTED]
diff --recursive -u linux~/CREDITS linux/CREDITS --- linux~/CREDITS Tue Nov 14 20:39:13 2000 +++ linux/CREDITS Tue Nov 14 19:54:51 2000 @@ -1600,7 +1600,8 @@ E: [EMAIL PROTECTED] E: [EMAIL PROTECTED] D: misc. kernel hacking and debugging -S: FL, USA +S: Gainesville, Florida 32608 +S: USA N: Martin von Löwis E: [EMAIL PROTECTED] diff --recursive -u linux~/Documentation/Configure.help linux/Documentation/Configure.help --- linux~/Documentation/Configure.help Tue Nov 14 20:39:13 2000 +++ linux/Documentation/Configure.help Tue Nov 14 19:54:51 2000 @@ -2355,7 +2355,7 @@ Intel 440LX/BX/GX support CONFIG_AGP_INTEL This option gives you AGP support for the GLX component of the - XFree86 4.x on Intel 440LX/BX/GX chipsets. + XFree86 4.x on Intel 440LX/BX/GX, 815, and 840 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 @@ -2363,9 +2363,9 @@ Intel I810/I810 DC100/I810e support CONFIG_AGP_I810 - This option gives you AGP support for the Xserver for the Intel - 810 chipset boards. This is required to do any useful video - modes. + 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. VIA chipset support CONFIG_AGP_VIA diff --recursive -u linux~/drivers/char/Config.in linux/drivers/char/Config.in --- linux~/drivers/char/Config.in Tue Nov 14 20:39:14 2000 +++ linux/drivers/char/Config.in Tue Nov 14 19:56:34 2000 @@ -178,8 +178,8 @@ tristate '/dev/agpgart (AGP Support)' CONFIG_AGP $CONFIG_DRM_AGP if [ "$CONFIG_AGP" != "n" ]; then - bool ' Intel 440LX/BX/GX 840 support' CONFIG_AGP_INTEL - bool ' Intel I810/I815 support' CONFIG_AGP_I810 + bool ' Intel 440LX/BX/GX and I815/I840 support' CONFIG_AGP_INTEL + bool ' Intel I810/I815 (on-board) support' CONFIG_AGP_I810 bool ' VIA chipset support' CONFIG_AGP_VIA bool ' AMD Irongate support' CONFIG_AGP_AMD bool ' Generic SiS support' CONFIG_AGP_SIS diff --recursive -u linux~/drivers/char/agp/agpgart_be.c linux/drivers/char/agp/agpgart_be.c --- linux~/drivers/char/agp/agpgart_be.c Tue Nov 14 20:39:14 2000 +++ linux/drivers/char/agp/agpgart_be.c Tue Nov 14 19:54:51 2000 @@ -2057,6 +2057,13 @@ "Intel", "440GX", intel_generic_setup }, + /* could we add support for PCI_DEVICE_ID_INTEL_815_1 too ? */ + { PCI_DEVICE_ID_INTEL_815_0, + PCI_VENDOR_ID_INTEL, + INTEL_I815, + "Intel", + "i815", + intel_generic_setup }, { PCI_DEVICE_ID_INTEL_840_0, PCI_VENDOR_ID_INTEL, INTEL_I840, diff --recursive -u linux~/include/linux/agp_backend.h linux/include/linux/agp_backend.h --- linux~/include/linux/agp_backend.h Tue Nov 14 20:39:15 2000 +++ linux/include/linux/agp_backend.h Tue Nov 14 19:54:53 2000 @@ -45,6 +45,7 @@ INTEL_BX, INTEL_GX, INTEL_I810, + INTEL_I815, INTEL_I840, VIA_GENERIC, VIA_VP3,