]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[AGPGART] Don't try to remap i810 registers on resume.
authorDave Jones <davej@redhat.com>
Sun, 4 Feb 2007 22:37:42 +0000 (17:37 -0500)
committerDave Jones <davej@redhat.com>
Sun, 4 Feb 2007 22:37:42 +0000 (17:37 -0500)
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>
drivers/char/agp/intel-agp.c

index 4e455f03b4f0bb6426df6aae671c2e676b4beb3a..49cf7e2df47af95ed350577e781df8ab14f512c3 100644 (file)
@@ -124,13 +124,15 @@ static int intel_i810_configure(void)
 
        current_size = A_SIZE_FIX(agp_bridge->current_size);
 
-       pci_read_config_dword(intel_i810_private.i810_dev, I810_MMADDR, &temp);
-       temp &= 0xfff80000;
-
-       intel_i810_private.registers = ioremap(temp, 128 * 4096);
        if (!intel_i810_private.registers) {
-               printk(KERN_ERR PFX "Unable to remap memory.\n");
-               return -ENOMEM;
+               pci_read_config_dword(intel_i810_private.i810_dev, I810_MMADDR, &temp);
+               temp &= 0xfff80000;
+
+               intel_i810_private.registers = ioremap(temp, 128 * 4096);
+               if (!intel_i810_private.registers) {
+                       printk(KERN_ERR PFX "Unable to remap memory.\n");
+                       return -ENOMEM;
+               }
        }
 
        if ((readl(intel_i810_private.registers+I810_DRAM_CTL)