Commit 06df6daf authored Feb 04, 2010 by FUJITA Tomonori Committed by Ingo Molnar Feb 04, 2010

x86/agp: Fix amd64-agp module initialization regression



This fixes the regression introduced by commit
42590a75 ("x86/agp: Fix
agp_amd64_init and agp_amd64_cleanup").

The commit 61684cea fixed the
above regression but it's not enough. When amd64-agp is built as
a module, AGP isn't initialized, iommu is initialized, all the
aperture is owned by the iommu.

Reported-by: Marin Mitov <mitov@issp.bas.bg>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Tested-by: Marin Mitov <mitov@issp.bas.bg>
LKML-Reference: <20100204090802S.fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent ab09809f

drivers/char/agp/amd64-agp.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -767,16 +767,19 @@ int __init agp_amd64_init(void)

		static int __init agp_amd64_mod_init(void)
		{
		#ifndef MODULE
		if (gart_iommu_aperture)
		return agp_bridges_found ? 0 : -ENODEV;

		#endif
		return agp_amd64_init();
		}

		static void __exit agp_amd64_cleanup(void)
		{
		#ifndef MODULE
		if (gart_iommu_aperture)
		return;
		#endif
		if (aperture_resource)
		release_resource(aperture_resource);
		pci_unregister_driver(&agp_amd64_pci_driver);