diff options
Diffstat (limited to 'drivers/char/agp/efficeon-agp.c')
-rw-r--r-- | drivers/char/agp/efficeon-agp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c index e7aea77a60f9..fed0a87448d8 100644 --- a/drivers/char/agp/efficeon-agp.c +++ b/drivers/char/agp/efficeon-agp.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Transmeta's Efficeon AGPGART driver. | 2 | * Transmeta's Efficeon AGPGART driver. |
3 | * | 3 | * |
4 | * Based upon a diff by Linus around November '02. | 4 | * Based upon a diff by Linus around November '02. |
5 | * | 5 | * |
6 | * Ported to the 2.6 kernel by Carlos Puchol <cpglinux@puchol.com> | 6 | * Ported to the 2.6 kernel by Carlos Puchol <cpglinux@puchol.com> |
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | /* | 10 | /* |
11 | * NOTE-cpg-040217: | 11 | * NOTE-cpg-040217: |
12 | * | 12 | * |
13 | * - when compiled as a module, after loading the module, | 13 | * - when compiled as a module, after loading the module, |
14 | * it will refuse to unload, indicating it is in use, | 14 | * it will refuse to unload, indicating it is in use, |
15 | * when it is not. | 15 | * when it is not. |
@@ -45,7 +45,7 @@ | |||
45 | * 8: Present | 45 | * 8: Present |
46 | * 7:6: reserved, write as zero | 46 | * 7:6: reserved, write as zero |
47 | * 5:0: GATT directory index: which 1st-level entry | 47 | * 5:0: GATT directory index: which 1st-level entry |
48 | * | 48 | * |
49 | * The Efficeon AGP spec requires pages to be WB-cacheable | 49 | * The Efficeon AGP spec requires pages to be WB-cacheable |
50 | * but to be explicitly CLFLUSH'd after any changes. | 50 | * but to be explicitly CLFLUSH'd after any changes. |
51 | */ | 51 | */ |
@@ -125,7 +125,7 @@ static int efficeon_configure(void) | |||
125 | struct aper_size_info_lvl2 *current_size; | 125 | struct aper_size_info_lvl2 *current_size; |
126 | 126 | ||
127 | printk(KERN_DEBUG PFX "efficeon_configure()\n"); | 127 | printk(KERN_DEBUG PFX "efficeon_configure()\n"); |
128 | 128 | ||
129 | current_size = A_SIZE_LVL2(agp_bridge->current_size); | 129 | current_size = A_SIZE_LVL2(agp_bridge->current_size); |
130 | 130 | ||
131 | /* aperture size */ | 131 | /* aperture size */ |
@@ -190,7 +190,7 @@ static int efficeon_create_gatt_table(struct agp_bridge_data *bridge) | |||
190 | const int present = EFFICEON_PRESENT; | 190 | const int present = EFFICEON_PRESENT; |
191 | const int clflush_chunk = ((cpuid_ebx(1) >> 8) & 0xff) << 3; | 191 | const int clflush_chunk = ((cpuid_ebx(1) >> 8) & 0xff) << 3; |
192 | int num_entries, l1_pages; | 192 | int num_entries, l1_pages; |
193 | 193 | ||
194 | num_entries = A_SIZE_LVL2(agp_bridge->current_size)->num_entries; | 194 | num_entries = A_SIZE_LVL2(agp_bridge->current_size)->num_entries; |
195 | 195 | ||
196 | printk(KERN_DEBUG PFX "efficeon_create_gatt_table(%d)\n", num_entries); | 196 | printk(KERN_DEBUG PFX "efficeon_create_gatt_table(%d)\n", num_entries); |
@@ -257,12 +257,12 @@ static int efficeon_insert_memory(struct agp_memory * mem, off_t pg_start, int t | |||
257 | 257 | ||
258 | if (!page) | 258 | if (!page) |
259 | continue; | 259 | continue; |
260 | 260 | ||
261 | page += (index & 0x3ff); | 261 | page += (index & 0x3ff); |
262 | *page = insert; | 262 | *page = insert; |
263 | 263 | ||
264 | /* clflush is slow, so don't clflush until we have to */ | 264 | /* clflush is slow, so don't clflush until we have to */ |
265 | if ( last_page && | 265 | if ( last_page && |
266 | ((unsigned long)page^(unsigned long)last_page) & clflush_mask ) | 266 | ((unsigned long)page^(unsigned long)last_page) & clflush_mask ) |
267 | asm volatile("clflush %0" : : "m" (*last_page)); | 267 | asm volatile("clflush %0" : : "m" (*last_page)); |
268 | 268 | ||
@@ -373,7 +373,7 @@ static int __devinit agp_efficeon_probe(struct pci_dev *pdev, | |||
373 | */ | 373 | */ |
374 | r = &pdev->resource[0]; | 374 | r = &pdev->resource[0]; |
375 | if (!r->start && r->end) { | 375 | if (!r->start && r->end) { |
376 | if(pci_assign_resource(pdev, 0)) { | 376 | if (pci_assign_resource(pdev, 0)) { |
377 | printk(KERN_ERR PFX "could not assign resource 0\n"); | 377 | printk(KERN_ERR PFX "could not assign resource 0\n"); |
378 | return -ENODEV; | 378 | return -ENODEV; |
379 | } | 379 | } |