Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b1fc9b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

parents 6bd25e78 b41c82eb

drivers/char/agp/Kconfig

+17 −38
Original line number Diff line number Diff line
@@ -15,22 +15,23 @@ config AGP 
	  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 X/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.



	  You should say Y here if you use XFree86 3.3.6 or 4.x and want to

	  use GLX or DRI.  If unsure, say N.



	  To compile this driver as a module, choose M here: the

	  module will be called agpgart.



	  You should say Y here if you want to use GLX or DRI.



	  If unsure, say N.



config AGP_ALI

	tristate "ALI chipset support"

	depends on AGP && X86_32

	---help---

	  This option gives you AGP support for the GLX component of

	  XFree86 4.x on the following ALi chipsets.  The supported chipsets

	  X on the following ALi chipsets.  The supported chipsets

	  include M1541, M1621, M1631, M1632, M1641,M1647,and M1651.

	  For the ALi-chipset question, ALi suggests you refer to

	  <http://www.ali.com.tw/eng/support/index.shtml>.
@@ -40,28 +41,19 @@ config AGP_ALI 
	  timing issues, this chipset cannot do AGP 2x with the G200.

	  This is a hardware limitation. AGP 1x seems to be fine, though.



	  You should say Y here if you use XFree86 3.3.6 or 4.x and want to

	  use GLX or DRI.  If unsure, say N.



config AGP_ATI

	tristate "ATI chipset support"

	depends on AGP && X86_32

	---help---

	  This option gives you AGP support for the GLX component of

      XFree86 4.x on the ATI RadeonIGP family of chipsets.



      You should say Y here if you use XFree86 3.3.6 or 4.x and want to

      use GLX or DRI.  If unsure, say N.

	  X on the ATI RadeonIGP family of chipsets.



config AGP_AMD

	tristate "AMD Irongate, 761, and 762 chipset support"

	depends on AGP && X86_32

	help

	  This option gives you AGP support for the GLX component of

	  XFree86 4.x on AMD Irongate, 761, and 762 chipsets.



	  You should say Y here if you use XFree86 3.3.6 or 4.x and want to

	  use GLX or DRI.  If unsure, say N.

	  X on AMD Irongate, 761, and 762 chipsets.



config AGP_AMD64

	tristate "AMD Opteron/Athlon64 on-CPU GART support" if !GART_IOMMU
@@ -69,45 +61,38 @@ config AGP_AMD64 
	default y if GART_IOMMU

	help

	  This option gives you AGP support for the GLX component of

	  XFree86 4.x using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs.

	  X using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs.

	  You still need an external AGP bridge like the AMD 8151, VIA

          K8T400M, SiS755. It may also support other AGP bridges when loaded

	  with agp_try_unsupported=1.

	  You should say Y here if you use XFree86 3.3.6 or 4.x and want to

	  use GLX or DRI.  If unsure, say Y



config AGP_INTEL

	tristate "Intel 440LX/BX/GX, I8xx and E7x05 chipset support"

	depends on AGP && X86

	help

	  This option gives you AGP support for the GLX component of XFree86 4.x

	  This option gives you AGP support for the GLX component of X

	  on Intel 440LX/BX/GX, 815, 820, 830, 840, 845, 850, 860, 875,

	  E7205 and E7505 chipsets and full support for the 810, 815, 830M, 845G,

	  852GM, 855GM, 865G and I915 integrated graphics chipsets.

	  E7205 and E7505 chipsets and full support for the 810, 815, 830M,

	  845G, 852GM, 855GM, 865G and I915 integrated graphics chipsets.





	  You should say Y here if you use XFree86 3.3.6 or 4.x and want to

	  use GLX or DRI, or if you have any Intel integrated graphics

	  chipsets.  If unsure, say Y.



config AGP_NVIDIA

	tristate "NVIDIA nForce/nForce2 chipset support"

	depends on AGP && X86_32

	help

	  This option gives you AGP support for the GLX component of

	  XFree86 4.x on the following NVIDIA chipsets.  The supported chipsets

	  include nForce and nForce2

	  X on NVIDIA chipsets including nForce and nForce2



config AGP_SIS

	tristate "SiS chipset support"

	depends on AGP && X86_32

	help

	  This option gives you AGP support for the GLX component of

	  XFree86 4.x on Silicon Integrated Systems [SiS] chipsets.

	  X on Silicon Integrated Systems [SiS] chipsets.



	  Note that 5591/5592 AGP chipsets are NOT supported.



	  You should say Y here if you use XFree86 3.3.6 or 4.x and want to

	  use GLX or DRI.  If unsure, say N.



config AGP_SWORKS

	tristate "Serverworks LE/HE chipset support"
@@ -121,10 +106,7 @@ config AGP_VIA 
	depends on AGP && X86_32

	help

	  This option gives you AGP support for the GLX component of

	  XFree86 4.x on VIA MVP3/Apollo Pro chipsets.



	  You should say Y here if you use XFree86 3.3.6 or 4.x and want to

	  use GLX or DRI.  If unsure, say N.

	  X on VIA MVP3/Apollo Pro chipsets.



config AGP_I460

	tristate "Intel 460GX chipset support"
@@ -159,9 +141,6 @@ config AGP_EFFICEON 
	  This option gives you AGP support for the Transmeta Efficeon

	  series processors with integrated northbridges.



	  You should say Y here if you use XFree86 3.3.6 or 4.x and want to

	  use GLX or DRI.  If unsure, say Y.



config AGP_SGI_TIOCA

        tristate "SGI TIO chipset AGP support"

        depends on AGP && (IA64_SGI_SN2 || IA64_GENERIC)

drivers/char/agp/amd64-agp.c

+4 −2
Original line number Diff line number Diff line
@@ -516,8 +516,10 @@ static int __devinit nforce3_agp_init(struct pci_dev *pdev) 
	pci_read_config_dword (hammers[0], AMD64_GARTAPERTUREBASE, &apbase);



	/* if x86-64 aperture base is beyond 4G, exit here */

	if ( (apbase & 0x7fff) >> (32 - 25) )

	if ( (apbase & 0x7fff) >> (32 - 25) ) {

		printk(KERN_INFO PFX "aperture base > 4G\n");

		return -ENODEV;

	}



	apbase = (apbase & 0x7fff) << 25;

drivers/char/agp/sworks-agp.c

+1 −3
Original line number Diff line number Diff line
@@ -468,9 +468,7 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev, 


	switch (pdev->device) {

	case 0x0006:

		/* ServerWorks CNB20HE

		Fail silently.*/

		printk (KERN_ERR PFX "Detected ServerWorks CNB20HE chipset: No AGP present.\n");

		printk (KERN_ERR PFX "ServerWorks CNB20HE is unsupported due to lack of documentation.\n");

		return -ENODEV;



	case PCI_DEVICE_ID_SERVERWORKS_HE: