diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/agp/backend.c | 3 | ||||
-rw-r--r-- | drivers/char/agp/generic.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c index 832ded20fe70..2720882e66fe 100644 --- a/drivers/char/agp/backend.c +++ b/drivers/char/agp/backend.c | |||
@@ -147,7 +147,6 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) | |||
147 | printk(KERN_ERR PFX "unable to get memory for scratch page.\n"); | 147 | printk(KERN_ERR PFX "unable to get memory for scratch page.\n"); |
148 | return -ENOMEM; | 148 | return -ENOMEM; |
149 | } | 149 | } |
150 | flush_agp_mappings(); | ||
151 | 150 | ||
152 | bridge->scratch_page_real = virt_to_gart(addr); | 151 | bridge->scratch_page_real = virt_to_gart(addr); |
153 | bridge->scratch_page = | 152 | bridge->scratch_page = |
@@ -191,7 +190,6 @@ err_out: | |||
191 | if (bridge->driver->needs_scratch_page) { | 190 | if (bridge->driver->needs_scratch_page) { |
192 | bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real), | 191 | bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real), |
193 | AGP_PAGE_DESTROY_UNMAP); | 192 | AGP_PAGE_DESTROY_UNMAP); |
194 | flush_agp_mappings(); | ||
195 | bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real), | 193 | bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real), |
196 | AGP_PAGE_DESTROY_FREE); | 194 | AGP_PAGE_DESTROY_FREE); |
197 | } | 195 | } |
@@ -219,7 +217,6 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge) | |||
219 | bridge->driver->needs_scratch_page) { | 217 | bridge->driver->needs_scratch_page) { |
220 | bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real), | 218 | bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real), |
221 | AGP_PAGE_DESTROY_UNMAP); | 219 | AGP_PAGE_DESTROY_UNMAP); |
222 | flush_agp_mappings(); | ||
223 | bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real), | 220 | bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real), |
224 | AGP_PAGE_DESTROY_FREE); | 221 | AGP_PAGE_DESTROY_FREE); |
225 | } | 222 | } |
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index 64b2f6d7059d..1a4674ce0c71 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c | |||
@@ -197,7 +197,6 @@ void agp_free_memory(struct agp_memory *curr) | |||
197 | for (i = 0; i < curr->page_count; i++) { | 197 | for (i = 0; i < curr->page_count; i++) { |
198 | curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i]), AGP_PAGE_DESTROY_UNMAP); | 198 | curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i]), AGP_PAGE_DESTROY_UNMAP); |
199 | } | 199 | } |
200 | flush_agp_mappings(); | ||
201 | for (i = 0; i < curr->page_count; i++) { | 200 | for (i = 0; i < curr->page_count; i++) { |
202 | curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i]), AGP_PAGE_DESTROY_FREE); | 201 | curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i]), AGP_PAGE_DESTROY_FREE); |
203 | } | 202 | } |
@@ -267,8 +266,6 @@ struct agp_memory *agp_allocate_memory(struct agp_bridge_data *bridge, | |||
267 | } | 266 | } |
268 | new->bridge = bridge; | 267 | new->bridge = bridge; |
269 | 268 | ||
270 | flush_agp_mappings(); | ||
271 | |||
272 | return new; | 269 | return new; |
273 | } | 270 | } |
274 | EXPORT_SYMBOL(agp_allocate_memory); | 271 | EXPORT_SYMBOL(agp_allocate_memory); |