aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2010-09-12 11:07:15 +0200
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-21 11:39:52 +0100
commitaaa62591199162e6496b4f47cac4f5923bc571d1 (patch)
tree1f3d74c71c3a3c914458af39890a4eb7ad2f324a
parente9b1cc81c2222108d866323c51f482dd6db8d689 (diff)
downloadmrst-s0i3-test-aaa62591199162e6496b4f47cac4f5923bc571d1.tar.gz
mrst-s0i3-test-aaa62591199162e6496b4f47cac4f5923bc571d1.tar.xz
mrst-s0i3-test-aaa62591199162e6496b4f47cac4f5923bc571d1.zip
agp: kill agp_(unmap|map)_memory
DMA remapping was only used by the intel-gtt driver. With that code now folded into the driver, kill the agp generic support for it. Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--drivers/char/agp/agp.h3
-rw-r--r--drivers/char/agp/generic.c8
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index 04ad0bbfaf4..5259065f3c7 100644
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
@@ -121,9 +121,6 @@ struct agp_bridge_driver {
void (*agp_destroy_pages)(struct agp_memory *);
int (*agp_type_to_mask_type) (struct agp_bridge_data *, int);
void (*chipset_flush)(struct agp_bridge_data *);
-
- int (*agp_map_memory)(struct agp_memory *mem);
- void (*agp_unmap_memory)(struct agp_memory *mem);
};
struct agp_bridge_data {
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index d2abf514398..78235ceccfa 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -437,11 +437,6 @@ int agp_bind_memory(struct agp_memory *curr, off_t pg_start)
curr->is_flushed = true;
}
- if (curr->bridge->driver->agp_map_memory) {
- ret_val = curr->bridge->driver->agp_map_memory(curr);
- if (ret_val)
- return ret_val;
- }
ret_val = curr->bridge->driver->insert_memory(curr, pg_start, curr->type);
if (ret_val != 0)
@@ -483,9 +478,6 @@ int agp_unbind_memory(struct agp_memory *curr)
if (ret_val != 0)
return ret_val;
- if (curr->bridge->driver->agp_unmap_memory)
- curr->bridge->driver->agp_unmap_memory(curr);
-
curr->is_bound = false;
curr->pg_start = 0;
spin_lock(&curr->bridge->mapped_lock);