Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4ac5e4f authored by Dave Jones's avatar Dave Jones
Browse files

[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: default avatarDave Jones <davej@redhat.com>
parent a030ce44

drivers/char/agp/intel-agp.c

+8 −6
Original line number Original line Diff line number Diff line
@@ -124,6 +124,7 @@ static int intel_i810_configure(void) 




	current_size = A_SIZE_FIX(agp_bridge->current_size);

	current_size = A_SIZE_FIX(agp_bridge->current_size);





	if (!intel_i810_private.registers) {

		pci_read_config_dword(intel_i810_private.i810_dev, I810_MMADDR, &temp);

		pci_read_config_dword(intel_i810_private.i810_dev, I810_MMADDR, &temp);

		temp &= 0xfff80000;

		temp &= 0xfff80000;
@@ -132,6 +133,7 @@ static int intel_i810_configure(void) 
			printk(KERN_ERR PFX "Unable to remap memory.\n");

			printk(KERN_ERR PFX "Unable to remap memory.\n");

			return -ENOMEM;

			return -ENOMEM;

		}

		}

	}





	if ((readl(intel_i810_private.registers+I810_DRAM_CTL)

	if ((readl(intel_i810_private.registers+I810_DRAM_CTL)

		& I810_DRAM_ROW_0) == I810_DRAM_ROW_0_SDRAM) {

		& I810_DRAM_ROW_0) == I810_DRAM_ROW_0_SDRAM) {