linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / char / agp / ati-agp.c

diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index f244c66..fcba749 100644 (file)
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -41,6 +41,7 @@ static struct gatt_mask ati_generic_masks[] =
 };
 
 
+
 typedef struct _ati_page_map {
        unsigned long *real;
        unsigned long __iomem *remapped;
@@ -73,7 +74,7 @@ static int ati_create_page_map(ati_page_map *page_map)
        /*CACHE_FLUSH();*/
        global_cache_flush();
 
-       for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) {
+       for(i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) {
                writel(agp_bridge->scratch_page, page_map->remapped+i);
                readl(page_map->remapped+i);    /* PCI Posting. */
        }
@@ -98,7 +99,7 @@ static void ati_free_gatt_pages(void)
        ati_page_map *entry;
 
        tables = ati_generic_private.gatt_pages;
-       for (i = 0; i < ati_generic_private.num_tables; i++) {
+       for(i = 0; i < ati_generic_private.num_tables; i++) {
                entry = tables[i];
                if (entry != NULL) {
                        if (entry->real != NULL)
@@ -140,8 +141,7 @@ static int ati_create_gatt_pages(int nr_tables)
        ati_generic_private.num_tables = nr_tables;
        ati_generic_private.gatt_pages = tables;
 
-       if (retval != 0)
-               ati_free_gatt_pages();
+       if (retval != 0) ati_free_gatt_pages();
 
        return retval;
 }
@@ -219,16 +219,16 @@ static int ati_configure(void)
        ati_generic_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);
 
        if (is_r200())
-               pci_write_config_dword(agp_bridge->dev, ATI_RS100_IG_AGPMODE, 0x20000);
+               pci_write_config_dword(agp_bridge->dev, ATI_RS100_IG_AGPMODE, 0x20000);
        else
                pci_write_config_dword(agp_bridge->dev, ATI_RS300_IG_AGPMODE, 0x20000);
 
        /* address to map too */
-       /*
+        /*
        pci_read_config_dword(agp_bridge.dev, AGP_APBASE, &temp);
        agp_bridge.gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
        printk(KERN_INFO PFX "IGP320 gart_bus_addr: %x\n", agp_bridge.gart_bus_addr);
-       */
+        */
        writel(0x60000, ati_generic_private.registers+ATI_GART_FEATURE_ID);
        readl(ati_generic_private.registers+ATI_GART_FEATURE_ID);       /* PCI Posting.*/
 
@@ -245,25 +245,23 @@ static int ati_configure(void)
 
 
 #ifdef CONFIG_PM
-static int agp_ati_suspend(struct pci_dev *dev, pm_message_t state)
+static int agp_ati_resume(struct pci_dev *dev)
 {
-       pci_save_state(dev);
-       pci_set_power_state(dev, 3);
+       pci_restore_state(dev);
 
-       return 0;
+       return ati_configure();
 }
 
-static int agp_ati_resume(struct pci_dev *dev)
+static int agp_ati_suspend(struct pci_dev *dev, pm_message_t state)
 {
-       pci_set_power_state(dev, 0);
-       pci_restore_state(dev);
+       pci_save_state(dev);
 
-       return ati_configure();
+       return 0;
 }
 #endif
 
 /*
- *Since we don't need contiguous memory we just try
+ *Since we don't need contigious memory we just try
  * to get the gatt table once
  */
 
@@ -323,9 +321,9 @@ static int ati_remove_memory(struct agp_memory * mem, off_t pg_start,
        unsigned long __iomem *cur_gatt;
        unsigned long addr;
 
-       if (type != 0 || mem->type != 0)
+       if (type != 0 || mem->type != 0) {
                return -EINVAL;
-
+       }
        for (i = pg_start; i < (mem->page_count + pg_start); i++) {
                addr = (i * PAGE_SIZE) + agp_bridge->gart_bus_addr;
                cur_gatt = GET_GATT(addr);
@@ -389,7 +387,7 @@ static int ati_create_gatt_table(struct agp_bridge_data *bridge)
        agp_bridge->gart_bus_addr = addr;
 
        /* Calculate the agp offset */
-       for (i = 0; i < value->num_entries / 1024; i++, addr += 0x00400000) {
+       for(i = 0; i < value->num_entries / 1024; i++, addr += 0x00400000) {
                writel(virt_to_gart(ati_generic_private.gatt_pages[i]->real) | 1,
                        page_dir.remapped+GET_PAGE_DIR_OFF(addr));
                readl(page_dir.remapped+GET_PAGE_DIR_OFF(addr));        /* PCI Posting. */
@@ -504,9 +502,10 @@ found:
 
        bridge->dev = pdev;
        bridge->capndx = cap_ptr;
-
+       
        bridge->driver = &ati_generic_bridge;
 
+
        printk(KERN_INFO PFX "Detected Ati %s chipset\n",
                        devs[j].chipset_name);
 
@@ -547,8 +546,8 @@ static struct pci_driver agp_ati_pci_driver = {
        .probe          = agp_ati_probe,
        .remove         = agp_ati_remove,
 #ifdef CONFIG_PM
-       .suspend        = agp_ati_suspend,
        .resume         = agp_ati_resume,
+       .suspend        = agp_ati_suspend,
 #endif
 };