Commit dcc1a66a authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds
Browse files

[PATCH] x86_64: use select for GART_IOMMU to enable AGP 



The AGP default doesn't work well with other selects, so use a select for
GART_IOMMU as well.  Remove a redundant default for SWIOTLB as well.

Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@muc.de>
Cc: Dave Jones <davej@codemonkey.org.uk>
Cc: Dave Airlie <airlied@linux.ie>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4f3865fb

arch/x86_64/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -389,6 +389,7 @@ config GART_IOMMU 
	bool "K8 GART IOMMU support"

	default y

	select SWIOTLB

	select AGP

	depends on PCI

	help

	  Support for hardware IOMMU in AMD's Opteron/Athlon64 Processors
@@ -401,11 +402,9 @@ config GART_IOMMU 
  	  northbridge and a software emulation used on other systems without

	  hardware IOMMU.  If unsure, say Y.



# need this always enabled with GART_IOMMU for the VIA workaround

# need this always selected by GART_IOMMU for the VIA workaround

config SWIOTLB

	bool

	default y

	depends on GART_IOMMU



config X86_MCE

	bool "Machine check support" if EMBEDDED

drivers/char/agp/Kconfig

+1 −2
Original line number Diff line number Diff line 
config AGP

	tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU

	tristate "/dev/agpgart (AGP Support)"

	depends on ALPHA || IA64 || PPC || X86

	default y if GART_IOMMU

	---help---

	  AGP (Accelerated Graphics Port) is a bus system mainly used to

	  connect graphics cards to the rest of the system.

CRA Git | Maintained and supported by SUSTech CRA and CCSE