vserver 1.9.5.x5

[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 8bf71c1..ab17cfd 100644 (file)
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -61,9 +61,6 @@ static int ati_create_page_map(ati_page_map *page_map)
 
        SetPageReserved(virt_to_page(page_map->real));
        err = map_page_into_agp(virt_to_page(page_map->real));
-
-       /* CACHE_FLUSH(); */
-       global_cache_flush();
        page_map->remapped = ioremap_nocache(virt_to_phys(page_map->real),
                                            PAGE_SIZE);
        if (page_map->remapped == NULL || err) {
@@ -75,8 +72,10 @@ 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. */
+       }
 
        return 0;
 }
@@ -186,7 +185,8 @@ static int ati_fetch_size(void)
 
 static void ati_tlbflush(struct agp_memory * mem)
 {
-       OUTREG32(ati_generic_private.registers, ATI_GART_CACHE_CNTRL, 1);
+       writel(1, ati_generic_private.registers+ATI_GART_CACHE_CNTRL);
+       readl(ati_generic_private.registers+ATI_GART_CACHE_CNTRL);      /* PCI Posting. */
 }
 
 static void ati_cleanup(void)
@@ -230,15 +230,16 @@ static int ati_configure(void)
        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);
         */
-       OUTREG32(ati_generic_private.registers, ATI_GART_FEATURE_ID, 0x60000);
+       writel(0x60000, ati_generic_private.registers+ATI_GART_FEATURE_ID);
+       readl(ati_generic_private.registers+ATI_GART_FEATURE_ID);       /* PCI Posting.*/
 
        /* SIGNALED_SYSTEM_ERROR @ NB_STATUS */
        pci_read_config_dword(agp_bridge->dev, 4, &temp);
        pci_write_config_dword(agp_bridge->dev, 4, temp | (1<<14));
 
        /* Write out the address of the gatt table */
-       OUTREG32(ati_generic_private.registers, ATI_GART_BASE,
-                agp_bridge->gatt_bus_addr);
+       writel(agp_bridge->gatt_bus_addr, ati_generic_private.registers+ATI_GART_BASE);
+       readl(ati_generic_private.registers+ATI_GART_BASE);     /* PCI Posting. */
 
        return 0;
 }
@@ -291,6 +292,7 @@ static int ati_insert_memory(struct agp_memory * mem,
                addr = (j * PAGE_SIZE) + agp_bridge->gart_bus_addr;
                cur_gatt = GET_GATT(addr);
                writel(agp_bridge->driver->mask_memory(mem->memory[i], mem->type), cur_gatt+GET_GATT_OFF(addr));
+               readl(cur_gatt+GET_GATT_OFF(addr));     /* PCI Posting. */
        }
        agp_bridge->driver->tlb_flush(mem);
        return 0;
@@ -310,6 +312,7 @@ static int ati_remove_memory(struct agp_memory * mem, off_t pg_start,
                addr = (i * PAGE_SIZE) + agp_bridge->gart_bus_addr;
                cur_gatt = GET_GATT(addr);
                writel(agp_bridge->scratch_page, cur_gatt+GET_GATT_OFF(addr));
+               readl(cur_gatt+GET_GATT_OFF(addr)); /* PCI Posting. */
        }
 
        agp_bridge->driver->tlb_flush(mem);
@@ -371,6 +374,7 @@ static int ati_create_gatt_table(void)
        for(i = 0; i < value->num_entries / 1024; i++, addr += 0x00400000) {
                writel(virt_to_bus(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. */
        }
 
        return 0;
@@ -525,6 +529,8 @@ static struct pci_driver agp_ati_pci_driver = {
 
 static int __init agp_ati_init(void)
 {
+       if (agp_off)
+               return -EINVAL;
        return pci_module_init(&agp_ati_pci_driver);
 }