On Friday 04 September 2009 17:17:19 tip-bot for Pavel Vasilyev wrote:
> Commit-ID: 6ac162d6c01ac7626f46c68c0770556cf682ce34
> Gitweb:
> http://git.kernel.org/tip/6ac162d6c01ac7626f46c68c0770556cf682ce34 Author:
> Pavel Vasilyev <[email protected]>
> AuthorDate: Thu, 3 Sep 2009 16:20:55 +0200
> Committer: Joerg Roedel <[email protected]>
> CommitDate: Thu, 3 Sep 2009 16:20:55 +0200
>
> x86/gart: Do not select AGP for GART_IOMMU
>
> There is no dependency from the gart code to the agp code.
> And since a lot of systems today do not have agp anymore
> remove this dependency from the kernel configuration.
>
> Signed-off-by: Pavel Vasilyev <[email protected]>
> Signed-off-by: Joerg Roedel <[email protected]>
>
>
> ---
> arch/x86/Kconfig | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index 13ffa5d..1d9c18a 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -586,7 +586,6 @@ config GART_IOMMU
> bool "GART IOMMU support" if EMBEDDED
> default y
> select SWIOTLB
> - select AGP
> depends on X86_64 && PCI
> ---help---
> Support for full DMA access of devices with 32bit memory access only
But what about the second part?
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index ccb1fa8..2fb3a48 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -56,9 +56,8 @@ config AGP_AMD
X on AMD Irongate, 761, and 762 chipsets.
config AGP_AMD64
- tristate "AMD Opteron/Athlon64 on-CPU GART support" if !GART_IOMMU
+ tristate "AMD Opteron/Athlon64 on-CPU GART support"
depends on AGP && X86
- default y if GART_IOMMU
help
This option gives you AGP support for the GLX component of
X using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs.