Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaa62591 authored by Daniel Vetter's avatar Daniel Vetter Committed by Chris Wilson
Browse files

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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent e9b1cc81

drivers/char/agp/agp.h

+0 −3
Original line number Diff line number Diff line
@@ -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 {

drivers/char/agp/generic.c

+0 −8
Original line number Diff line number Diff line
@@ -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);