diff options
Diffstat (limited to 'drivers/char/agp/uninorth-agp.c')
-rw-r--r-- | drivers/char/agp/uninorth-agp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c index 50947e38501a..9846defbddb4 100644 --- a/drivers/char/agp/uninorth-agp.c +++ b/drivers/char/agp/uninorth-agp.c | |||
@@ -95,12 +95,12 @@ static void uninorth_cleanup(void) | |||
95 | static int uninorth_configure(void) | 95 | static int uninorth_configure(void) |
96 | { | 96 | { |
97 | struct aper_size_info_32 *current_size; | 97 | struct aper_size_info_32 *current_size; |
98 | 98 | ||
99 | current_size = A_SIZE_32(agp_bridge->current_size); | 99 | current_size = A_SIZE_32(agp_bridge->current_size); |
100 | 100 | ||
101 | printk(KERN_INFO PFX "configuring for size idx: %d\n", | 101 | printk(KERN_INFO PFX "configuring for size idx: %d\n", |
102 | current_size->size_value); | 102 | current_size->size_value); |
103 | 103 | ||
104 | /* aperture size and gatt addr */ | 104 | /* aperture size and gatt addr */ |
105 | pci_write_config_dword(agp_bridge->dev, | 105 | pci_write_config_dword(agp_bridge->dev, |
106 | UNI_N_CFG_GART_BASE, | 106 | UNI_N_CFG_GART_BASE, |
@@ -127,7 +127,7 @@ static int uninorth_configure(void) | |||
127 | UNI_N_CFG_GART_DUMMY_PAGE, | 127 | UNI_N_CFG_GART_DUMMY_PAGE, |
128 | agp_bridge->scratch_page_real >> 12); | 128 | agp_bridge->scratch_page_real >> 12); |
129 | } | 129 | } |
130 | 130 | ||
131 | return 0; | 131 | return 0; |
132 | } | 132 | } |
133 | 133 | ||
@@ -162,7 +162,7 @@ static int uninorth_insert_memory(struct agp_memory *mem, off_t pg_start, | |||
162 | } | 162 | } |
163 | (void)in_le32((volatile u32*)&agp_bridge->gatt_table[pg_start]); | 163 | (void)in_le32((volatile u32*)&agp_bridge->gatt_table[pg_start]); |
164 | mb(); | 164 | mb(); |
165 | flush_dcache_range((unsigned long)&agp_bridge->gatt_table[pg_start], | 165 | flush_dcache_range((unsigned long)&agp_bridge->gatt_table[pg_start], |
166 | (unsigned long)&agp_bridge->gatt_table[pg_start + mem->page_count]); | 166 | (unsigned long)&agp_bridge->gatt_table[pg_start + mem->page_count]); |
167 | 167 | ||
168 | uninorth_tlbflush(mem); | 168 | uninorth_tlbflush(mem); |
@@ -235,7 +235,7 @@ static void uninorth_agp_enable(struct agp_bridge_data *bridge, u32 mode) | |||
235 | 235 | ||
236 | command = agp_collect_device_status(bridge, mode, status); | 236 | command = agp_collect_device_status(bridge, mode, status); |
237 | command |= PCI_AGP_COMMAND_AGP; | 237 | command |= PCI_AGP_COMMAND_AGP; |
238 | 238 | ||
239 | if (uninorth_rev == 0x21) { | 239 | if (uninorth_rev == 0x21) { |
240 | /* | 240 | /* |
241 | * Darwin disable AGP 4x on this revision, thus we | 241 | * Darwin disable AGP 4x on this revision, thus we |
@@ -456,7 +456,7 @@ static struct aper_size_info_32 uninorth_sizes[7] = | |||
456 | {256, 65536, 6, 64}, | 456 | {256, 65536, 6, 64}, |
457 | {128, 32768, 5, 32}, | 457 | {128, 32768, 5, 32}, |
458 | {64, 16384, 4, 16}, | 458 | {64, 16384, 4, 16}, |
459 | #endif | 459 | #endif |
460 | {32, 8192, 3, 8}, | 460 | {32, 8192, 3, 8}, |
461 | {16, 4096, 2, 4}, | 461 | {16, 4096, 2, 4}, |
462 | {8, 2048, 1, 2}, | 462 | {8, 2048, 1, 2}, |