diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-04-13 18:29:57 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2010-04-18 20:39:39 -0400 |
commit | 1ca46bd13474f71a361b147b13318aefa714551d (patch) | |
tree | fdddf556af652206d2bab3990d047e8949b8054b | |
parent | 22dd82a3f5ceef72be19e502418823a2f8801ed0 (diff) |
agp/intel-gtt: kill intel_i830_tlbflush
We don't use the generic insert/remove_memory functions that
require this. So kill this useless code.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r-- | drivers/char/agp/intel-gtt.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 131c5d5e427e..6cb80189743e 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c | |||
@@ -266,11 +266,6 @@ static void intel_i810_cleanup(void) | |||
266 | iounmap(intel_private.registers); | 266 | iounmap(intel_private.registers); |
267 | } | 267 | } |
268 | 268 | ||
269 | static void intel_i810_tlbflush(struct agp_memory *mem) | ||
270 | { | ||
271 | return; | ||
272 | } | ||
273 | |||
274 | static void intel_i810_agp_enable(struct agp_bridge_data *bridge, u32 mode) | 269 | static void intel_i810_agp_enable(struct agp_bridge_data *bridge, u32 mode) |
275 | { | 270 | { |
276 | return; | 271 | return; |
@@ -372,7 +367,6 @@ static int intel_i810_insert_entries(struct agp_memory *mem, off_t pg_start, | |||
372 | goto out_err; | 367 | goto out_err; |
373 | } | 368 | } |
374 | 369 | ||
375 | agp_bridge->driver->tlb_flush(mem); | ||
376 | out: | 370 | out: |
377 | ret = 0; | 371 | ret = 0; |
378 | out_err: | 372 | out_err: |
@@ -393,7 +387,6 @@ static int intel_i810_remove_entries(struct agp_memory *mem, off_t pg_start, | |||
393 | } | 387 | } |
394 | readl(intel_private.registers+I810_PTE_BASE+((i-1)*4)); | 388 | readl(intel_private.registers+I810_PTE_BASE+((i-1)*4)); |
395 | 389 | ||
396 | agp_bridge->driver->tlb_flush(mem); | ||
397 | return 0; | 390 | return 0; |
398 | } | 391 | } |
399 | 392 | ||
@@ -938,7 +931,6 @@ static int intel_i830_insert_entries(struct agp_memory *mem, off_t pg_start, | |||
938 | intel_private.registers+I810_PTE_BASE+(j*4)); | 931 | intel_private.registers+I810_PTE_BASE+(j*4)); |
939 | } | 932 | } |
940 | readl(intel_private.registers+I810_PTE_BASE+((j-1)*4)); | 933 | readl(intel_private.registers+I810_PTE_BASE+((j-1)*4)); |
941 | agp_bridge->driver->tlb_flush(mem); | ||
942 | 934 | ||
943 | out: | 935 | out: |
944 | ret = 0; | 936 | ret = 0; |
@@ -966,7 +958,6 @@ static int intel_i830_remove_entries(struct agp_memory *mem, off_t pg_start, | |||
966 | } | 958 | } |
967 | readl(intel_private.registers+I810_PTE_BASE+((i-1)*4)); | 959 | readl(intel_private.registers+I810_PTE_BASE+((i-1)*4)); |
968 | 960 | ||
969 | agp_bridge->driver->tlb_flush(mem); | ||
970 | return 0; | 961 | return 0; |
971 | } | 962 | } |
972 | 963 | ||
@@ -1166,7 +1157,6 @@ static int intel_i915_insert_entries(struct agp_memory *mem, off_t pg_start, | |||
1166 | global_cache_flush(); | 1157 | global_cache_flush(); |
1167 | 1158 | ||
1168 | intel_agp_insert_sg_entries(mem, pg_start, mask_type); | 1159 | intel_agp_insert_sg_entries(mem, pg_start, mask_type); |
1169 | agp_bridge->driver->tlb_flush(mem); | ||
1170 | 1160 | ||
1171 | out: | 1161 | out: |
1172 | ret = 0; | 1162 | ret = 0; |
@@ -1194,7 +1184,6 @@ static int intel_i915_remove_entries(struct agp_memory *mem, off_t pg_start, | |||
1194 | 1184 | ||
1195 | readl(intel_private.gtt+i-1); | 1185 | readl(intel_private.gtt+i-1); |
1196 | 1186 | ||
1197 | agp_bridge->driver->tlb_flush(mem); | ||
1198 | return 0; | 1187 | return 0; |
1199 | } | 1188 | } |
1200 | 1189 | ||
@@ -1386,7 +1375,6 @@ static const struct agp_bridge_driver intel_810_driver = { | |||
1386 | .configure = intel_i810_configure, | 1375 | .configure = intel_i810_configure, |
1387 | .fetch_size = intel_i810_fetch_size, | 1376 | .fetch_size = intel_i810_fetch_size, |
1388 | .cleanup = intel_i810_cleanup, | 1377 | .cleanup = intel_i810_cleanup, |
1389 | .tlb_flush = intel_i810_tlbflush, | ||
1390 | .mask_memory = intel_i810_mask_memory, | 1378 | .mask_memory = intel_i810_mask_memory, |
1391 | .masks = intel_i810_masks, | 1379 | .masks = intel_i810_masks, |
1392 | .agp_enable = intel_i810_agp_enable, | 1380 | .agp_enable = intel_i810_agp_enable, |
@@ -1413,7 +1401,6 @@ static const struct agp_bridge_driver intel_830_driver = { | |||
1413 | .configure = intel_i830_configure, | 1401 | .configure = intel_i830_configure, |
1414 | .fetch_size = intel_i830_fetch_size, | 1402 | .fetch_size = intel_i830_fetch_size, |
1415 | .cleanup = intel_i830_cleanup, | 1403 | .cleanup = intel_i830_cleanup, |
1416 | .tlb_flush = intel_i810_tlbflush, | ||
1417 | .mask_memory = intel_i810_mask_memory, | 1404 | .mask_memory = intel_i810_mask_memory, |
1418 | .masks = intel_i810_masks, | 1405 | .masks = intel_i810_masks, |
1419 | .agp_enable = intel_i810_agp_enable, | 1406 | .agp_enable = intel_i810_agp_enable, |
@@ -1441,7 +1428,6 @@ static const struct agp_bridge_driver intel_915_driver = { | |||
1441 | .configure = intel_i915_configure, | 1428 | .configure = intel_i915_configure, |
1442 | .fetch_size = intel_i9xx_fetch_size, | 1429 | .fetch_size = intel_i9xx_fetch_size, |
1443 | .cleanup = intel_i915_cleanup, | 1430 | .cleanup = intel_i915_cleanup, |
1444 | .tlb_flush = intel_i810_tlbflush, | ||
1445 | .mask_memory = intel_i810_mask_memory, | 1431 | .mask_memory = intel_i810_mask_memory, |
1446 | .masks = intel_i810_masks, | 1432 | .masks = intel_i810_masks, |
1447 | .agp_enable = intel_i810_agp_enable, | 1433 | .agp_enable = intel_i810_agp_enable, |
@@ -1475,7 +1461,6 @@ static const struct agp_bridge_driver intel_i965_driver = { | |||
1475 | .configure = intel_i915_configure, | 1461 | .configure = intel_i915_configure, |
1476 | .fetch_size = intel_i9xx_fetch_size, | 1462 | .fetch_size = intel_i9xx_fetch_size, |
1477 | .cleanup = intel_i915_cleanup, | 1463 | .cleanup = intel_i915_cleanup, |
1478 | .tlb_flush = intel_i810_tlbflush, | ||
1479 | .mask_memory = intel_i965_mask_memory, | 1464 | .mask_memory = intel_i965_mask_memory, |
1480 | .masks = intel_i810_masks, | 1465 | .masks = intel_i810_masks, |
1481 | .agp_enable = intel_i810_agp_enable, | 1466 | .agp_enable = intel_i810_agp_enable, |
@@ -1509,7 +1494,6 @@ static const struct agp_bridge_driver intel_g33_driver = { | |||
1509 | .configure = intel_i915_configure, | 1494 | .configure = intel_i915_configure, |
1510 | .fetch_size = intel_i9xx_fetch_size, | 1495 | .fetch_size = intel_i9xx_fetch_size, |
1511 | .cleanup = intel_i915_cleanup, | 1496 | .cleanup = intel_i915_cleanup, |
1512 | .tlb_flush = intel_i810_tlbflush, | ||
1513 | .mask_memory = intel_i965_mask_memory, | 1497 | .mask_memory = intel_i965_mask_memory, |
1514 | .masks = intel_i810_masks, | 1498 | .masks = intel_i810_masks, |
1515 | .agp_enable = intel_i810_agp_enable, | 1499 | .agp_enable = intel_i810_agp_enable, |