vserver 1.9.5.x5

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

diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c
index 16d8bdc..936d366 100644 (file)
--- a/drivers/char/agp/nvidia-agp.c
+++ b/drivers/char/agp/nvidia-agp.c
@@ -214,9 +214,11 @@ static int nvidia_insert_memory(struct agp_memory *mem, off_t pg_start, int type
                global_cache_flush();
                mem->is_flushed = TRUE;
        }
-       for (i = 0, j = pg_start; i < mem->page_count; i++, j++)
+       for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
                writel(agp_bridge->driver->mask_memory(mem->memory[i], mem->type),
                        agp_bridge->gatt_table+nvidia_private.pg_offset+j);
+               readl(agp_bridge->gatt_table+nvidia_private.pg_offset+j);       /* PCI Posting. */
+       }
        agp_bridge->driver->tlb_flush(mem);
        return 0;
 }
@@ -403,6 +405,8 @@ static struct pci_driver agp_nvidia_pci_driver = {
 
 static int __init agp_nvidia_init(void)
 {
+       if (agp_off)
+               return -EINVAL;
        return pci_module_init(&agp_nvidia_pci_driver);
 }