x86/agp: Fix agp_amd64_init regression
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Mon, 25 Jan 2010 05:10:47 +0000 (14:10 +0900)
committerIngo Molnar <mingo@elte.hu>
Sun, 31 Jan 2010 06:52:26 +0000 (07:52 +0100)
commit61684ceaad4f65d1a9832c722f7bd5e7fc714de9
tree8a2509f1582656759efbecf98037a6aaff8d128d
parent7c099ce1575126395f186ecf58b51a60d5c3be7d
x86/agp: Fix agp_amd64_init regression

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

The above commit changes agp_amd64_init() not to do anything if
gart_iommu_aperture is not zero.

If GART iommu calls agp_amd64_init(), we need to skip
agp_amd64_init() when it's called later via module_init.

The problem is that gart_iommu_init() calls agp_amd64_init()
with not zero gart_iommu_aperture so agp_amd64_init() is never
initialized.

When gart_iommu_init() calls agp_amd64_init(), agp should be
always initialized.

Reported-by: Marin Mitov <mitov@issp.bas.bg>
Reported-by: Johannes Hirte <johannes.hirte@fem.tu-ilmenau.de>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Tested-by: Marin Mitov <mitov@issp.bas.bg>
Tested-by: Kevin Winchester <kjwinchester@gmail.com>
Cc: davej@redhat.com
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <20100125141006O.fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
drivers/char/agp/amd64-agp.c