summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/aperture_64.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2008-06-10 00:10:48 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-12 14:11:25 +0200
commit6703f6d10dcd3316e03641a5ecaa6c8a04374d98 (patch)
treef8c1d9bbc5695979d2ad822a7bccb42f375dc904 /arch/x86/kernel/aperture_64.c
parentMerge branch 'linus' into x86/gart (diff)
downloadlinux-6703f6d10dcd3316e03641a5ecaa6c8a04374d98.tar.xz
linux-6703f6d10dcd3316e03641a5ecaa6c8a04374d98.zip
x86, gart: add resume handling
If GART IOMMU is used on an AMD64 system, the northbridge registers related to it should be restored during resume so that memory is not corrupted. Make gart_resume() handle that as appropriate. Ref. http://lkml.org/lkml/2008/5/25/96 and the following thread. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/aperture_64.c')
-rw-r--r--arch/x86/kernel/aperture_64.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
index eb20f168c0fd..3409abb231ac 100644
--- a/arch/x86/kernel/aperture_64.c
+++ b/arch/x86/kernel/aperture_64.c
@@ -496,4 +496,6 @@ out:
write_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE, aper_alloc >> 25);
}
}
+
+ set_up_gart_resume(aper_order, aper_alloc);
}