aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2007-02-04 17:37:42 -0500
committerDave Jones <davej@redhat.com>2007-02-04 17:37:42 -0500
commite4ac5e4f55f55b16e084a46b1b8e233f490ba701 (patch)
tree9421c4844b978e7a8abd01f4cf525804738724aa
parenta030ce4477baa06dd9c037ccd3c8d171aac9ed44 (diff)
[AGPGART] Don't try to remap i810 registers on resume.
We don't unmap them on the suspend path, so on resume trying to remap will fail, and then result in an oops the next time something tries to access them. Signed-off-by: Dave Jones <davej@redhat.com>
-rw-r--r--drivers/char/agp/intel-agp.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 4e455f03b4f0..49cf7e2df47a 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -124,13 +124,15 @@ static int intel_i810_configure(void)
124 124
125 current_size = A_SIZE_FIX(agp_bridge->current_size); 125 current_size = A_SIZE_FIX(agp_bridge->current_size);
126 126
127 pci_read_config_dword(intel_i810_private.i810_dev, I810_MMADDR, &temp);
128 temp &= 0xfff80000;
129
130 intel_i810_private.registers = ioremap(temp, 128 * 4096);
131 if (!intel_i810_private.registers) { 127 if (!intel_i810_private.registers) {
132 printk(KERN_ERR PFX "Unable to remap memory.\n"); 128 pci_read_config_dword(intel_i810_private.i810_dev, I810_MMADDR, &temp);
133 return -ENOMEM; 129 temp &= 0xfff80000;
130
131 intel_i810_private.registers = ioremap(temp, 128 * 4096);
132 if (!intel_i810_private.registers) {
133 printk(KERN_ERR PFX "Unable to remap memory.\n");
134 return -ENOMEM;
135 }
134 } 136 }
135 137
136 if ((readl(intel_i810_private.registers+I810_DRAM_CTL) 138 if ((readl(intel_i810_private.registers+I810_DRAM_CTL)