summaryrefslogtreecommitdiffstats
path: root/drivers/char/agp
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-05-21 17:11:42 -0400
committerDave Jones <davej@redhat.com>2006-05-21 17:11:42 -0400
commitca2797ffaabc1f73cf8a73a30f709f0c1a6bef34 (patch)
treed35dfea7bba8018eb6ed1822f7b4bc54a8fb2c04 /drivers/char/agp
parent283a12c53b9abeed89491da4a1eda98f5764947b (diff)
downloadkernel-crypto-ca2797ffaabc1f73cf8a73a30f709f0c1a6bef34.tar.gz
kernel-crypto-ca2797ffaabc1f73cf8a73a30f709f0c1a6bef34.tar.xz
kernel-crypto-ca2797ffaabc1f73cf8a73a30f709f0c1a6bef34.zip
[AGPGART] Fix Nforce3 suspend on amd64.
kernel.org bugzilla #6206 Based on patch from Serge Belyshev <belyshev@depni.sinp.msu.ru> Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'drivers/char/agp')
-rw-r--r--drivers/char/agp/amd64-agp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 36517d4d1ad..ac3c33a2e37 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -617,6 +617,9 @@ static int agp_amd64_resume(struct pci_dev *pdev)
pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
+ if (pdev->vendor == PCI_VENDOR_ID_NVIDIA)
+ nforce3_agp_init(pdev);
+
return amd_8151_configure();
}