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

Commit 2a32c3c8 authored by Stuart Bennett's avatar Stuart Bennett Committed by Dave Airlie
Browse files

agp/amd-k7: Suspend support for AMD K7 GART driver 



Reinitialize bridge registers after suspend, but avoid repeating the ioremap

Tested and works on AMD761

Signed-off-by: default avatarStuart Bennett <stuart@freedesktop.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 44d49441

drivers/char/agp/amd-k7-agp.c

+32 −6
Original line number Diff line number Diff line
@@ -223,12 +223,14 @@ static int amd_irongate_configure(void) 


	current_size = A_SIZE_LVL2(agp_bridge->current_size);



	if (!amd_irongate_private.registers) {

		/* Get the memory mapped registers */

		pci_read_config_dword(agp_bridge->dev, AMD_MMBASE, &temp);

		temp = (temp & PCI_BASE_ADDRESS_MEM_MASK);

		amd_irongate_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);

		if (!amd_irongate_private.registers)

			return -ENOMEM;

	}



	/* Write out the address of the gatt table */

	writel(agp_bridge->gatt_bus_addr, amd_irongate_private.registers+AMD_ATTBASE);
@@ -490,6 +492,26 @@ static void __devexit agp_amdk7_remove(struct pci_dev *pdev) 
	agp_put_bridge(bridge);

}



#ifdef CONFIG_PM



static int agp_amdk7_suspend(struct pci_dev *pdev, pm_message_t state)

{

	pci_save_state(pdev);

	pci_set_power_state(pdev, pci_choose_state(pdev, state));



	return 0;

}



static int agp_amdk7_resume(struct pci_dev *pdev)

{

	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);



	return amd_irongate_driver.configure();

}



#endif /* CONFIG_PM */



/* must be the same order as name table above */

static struct pci_device_id agp_amdk7_pci_table[] = {

	{
@@ -526,6 +548,10 @@ static struct pci_driver agp_amdk7_pci_driver = { 
	.id_table	= agp_amdk7_pci_table,

	.probe		= agp_amdk7_probe,

	.remove		= agp_amdk7_remove,

#ifdef CONFIG_PM

	.suspend	= agp_amdk7_suspend,

	.resume		= agp_amdk7_resume,

#endif

};



static int __init agp_amdk7_init(void)