8 files changed, 24 insertions, 18 deletions

diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index 0b9cf9c59a21..46685a540772 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -1,7 +1,6 @@
 config AGP
-        tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU
+        tristate "/dev/agpgart (AGP Support)"
         depends on ALPHA || IA64 || PPC || X86
-        default y if GART_IOMMU
         ---help---
           AGP (Accelerated Graphics Port) is a bus system mainly used to
           connect graphics cards to the rest of the system.
@@ -86,7 +85,7 @@ config AGP_NVIDIA
 
 config AGP_SIS
         tristate "SiS chipset support"
-        depends on AGP && X86_32
+        depends on AGP
         help
           This option gives you AGP support for the GLX component of
           X on Silicon Integrated Systems [SiS] chipsets.
diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c
index 2b5838e64751..b4e00a343da9 100644
--- a/drivers/char/agp/alpha-agp.c
+++ b/drivers/char/agp/alpha-agp.c
@@ -46,12 +46,6 @@ struct vm_operations_struct alpha_core_agp_vm_ops = {
 };
 
 
-static int alpha_core_agp_nop(void)
-{
-        /* just return success */
-        return 0;
-}
-
 static int alpha_core_agp_fetch_size(void)
 {
         return alpha_core_agp_sizes[0].size;
@@ -120,6 +114,11 @@ static int alpha_core_agp_remove_memory(struct agp_memory *mem, off_t pg_start,
         return status;
 }
 
+static int alpha_core_agp_create_free_gatt_table(struct agp_bridge_data *a)
+{
+        return 0;
+}
+
 struct agp_bridge_driver alpha_core_agp_driver = {
         .owner                  = THIS_MODULE,
         .aperture_sizes         = alpha_core_agp_sizes,
@@ -135,8 +134,8 @@ struct agp_bridge_driver alpha_core_agp_driver = {
         .tlb_flush              = alpha_core_agp_tlbflush,
         .mask_memory            = agp_generic_mask_memory,
         .cache_flush            = global_cache_flush,
-        .create_gatt_table      = alpha_core_agp_nop,
-        .free_gatt_table        = alpha_core_agp_nop,
+        .create_gatt_table      = alpha_core_agp_create_free_gatt_table,
+        .free_gatt_table        = alpha_core_agp_create_free_gatt_table,
         .insert_memory          = alpha_core_agp_insert_memory,
         .remove_memory          = alpha_core_agp_remove_memory,
         .alloc_by_type          = agp_generic_alloc_by_type,
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 36517d4d1ad9..ac3c33a2e37d 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -617,6 +617,9 @@ static int agp_amd64_resume(struct pci_dev *pdev)
         pci_set_power_state(pdev, PCI_D0);
         pci_restore_state(pdev);
 
+        if (pdev->vendor == PCI_VENDOR_ID_NVIDIA)
+                nforce3_agp_init(pdev);
+
         return amd_8151_configure();
 }
 
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 4e1891e2c035..a92ab53a1370 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -809,12 +809,10 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
                                 case U32_APER_SIZE:
                                         bridge->current_size = A_IDX32(bridge);
                                         break;
-                                        /* This case will never really happen. */
+                                /* These cases will never really happen. */
                                 case FIXED_APER_SIZE:
                                 case LVL2_APER_SIZE:
                                 default:
-                                        bridge->current_size =
-                                            bridge->current_size;
                                         break;
                                 }
                                 temp = bridge->current_size;
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index 8c4c6ef748ec..907fb66ec4a9 100644
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -497,7 +497,7 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret)
                         info = buffer.pointer;
                         info->hardware_id.value[sizeof(info->hardware_id)-1] = '\0';
                         match = (strcmp(info->hardware_id.value, "HWP0001") == 0);
-                        ACPI_MEM_FREE(info);
+                        kfree(info);
                         if (match) {
                                 status = hp_acpi_csr_space(handle, &sba_hpa, &length);
                                 if (ACPI_SUCCESS(status))
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index bddcae54b16d..61ac3809f997 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -736,7 +736,7 @@ static int intel_i915_remove_entries(struct agp_memory *mem,off_t pg_start,
 static int intel_i915_fetch_size(void)
 {
         struct aper_size_info_fixed *values;
-        u32 temp, offset = 0;
+        u32 temp, offset;
 
 #define I915_256MB_ADDRESS_MASK (1<<27)
 
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index 9846defbddb4..1de1b12043bf 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -329,7 +329,7 @@ static int agp_uninorth_suspend(struct pci_dev *pdev)
         /* turn off AGP on the bridge */
         agp = pci_find_capability(pdev, PCI_CAP_ID_AGP);
         pci_read_config_dword(pdev, agp + PCI_AGP_COMMAND, &cmd);
-        bridge->dev_private_data = (void *)cmd;
+        bridge->dev_private_data = (void *)(long)cmd;
         if (cmd & PCI_AGP_COMMAND_AGP) {
                 printk("uninorth-agp: disabling AGP on bridge %s\n",
                                 pci_name(pdev));
@@ -351,7 +351,7 @@ static int agp_uninorth_resume(struct pci_dev *pdev)
         if (bridge == NULL)
                 return -ENODEV;
 
-        command = (u32)bridge->dev_private_data;
+        command = (long)bridge->dev_private_data;
         bridge->dev_private_data = NULL;
         if (!(command & PCI_AGP_COMMAND_AGP))
                 return 0;
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index 97b0a890ba7f..b8ec25d17478 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -345,6 +345,12 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata =
                 .chipset_name   = "PT880",
         },
 
+        /* PT880 Ultra */
+        {
+                .device_id      = PCI_DEVICE_ID_VIA_PT880ULTRA,
+                .chipset_name   = "PT880 Ultra",
+        },
+
         /* PT890 */
         {
                 .device_id      = PCI_DEVICE_ID_VIA_8783_0,
@@ -511,6 +517,7 @@ static struct pci_device_id agp_via_pci_table[] = {
         ID(PCI_DEVICE_ID_VIA_8763_0),
         ID(PCI_DEVICE_ID_VIA_8378_0),
         ID(PCI_DEVICE_ID_VIA_PT880),
+        ID(PCI_DEVICE_ID_VIA_PT880ULTRA),
         ID(PCI_DEVICE_ID_VIA_8783_0),
         ID(PCI_DEVICE_ID_VIA_PX8X0_0),
         ID(PCI_DEVICE_ID_VIA_3269_0),