Skip to content

Commit

Permalink
[AGPGART] Don't try to remap i810 registers on resume.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dave Jones committed Feb 4, 2007
1 parent a030ce4 commit e4ac5e4
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions drivers/char/agp/intel-agp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit e4ac5e4

Please sign in to comment.