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

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

agp: kill agp_(map|unmap)_page 



Only used to remap the scratch page. Now that intel-gtt does this
itself, kill the support code.

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 d0b6dc4b

drivers/char/agp/agp.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -122,8 +122,6 @@ struct agp_bridge_driver { 
	int (*agp_type_to_mask_type) (struct agp_bridge_data *, int);

	int (*agp_type_to_mask_type) (struct agp_bridge_data *, int);

	void (*chipset_flush)(struct agp_bridge_data *);

	void (*chipset_flush)(struct agp_bridge_data *);





	int (*agp_map_page)(struct page *page, dma_addr_t *ret);

	void (*agp_unmap_page)(struct page *page, dma_addr_t dma);

	int (*agp_map_memory)(struct agp_memory *mem);

	int (*agp_map_memory)(struct agp_memory *mem);

	void (*agp_unmap_memory)(struct agp_memory *mem);

	void (*agp_unmap_memory)(struct agp_memory *mem);

};

};

drivers/char/agp/backend.c

+1 −21
Original line number Original line Diff line number Diff line
@@ -151,17 +151,7 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) 
		}

		}





		bridge->scratch_page_page = page;

		bridge->scratch_page_page = page;

		if (bridge->driver->agp_map_page) {

			if (bridge->driver->agp_map_page(page,

							 &bridge->scratch_page_dma)) {

				dev_err(&bridge->dev->dev,

					"unable to dma-map scratch page\n");

				rc = -ENOMEM;

				goto err_out_nounmap;

			}

		} else {

		bridge->scratch_page_dma = page_to_phys(page);

		bridge->scratch_page_dma = page_to_phys(page);

		}





		bridge->scratch_page = bridge->driver->mask_memory(bridge,

		bridge->scratch_page = bridge->driver->mask_memory(bridge,

						   bridge->scratch_page_dma, 0);

						   bridge->scratch_page_dma, 0);
@@ -204,12 +194,6 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) 
	return 0;

	return 0;





err_out:

err_out:

	if (bridge->driver->needs_scratch_page &&

	    bridge->driver->agp_unmap_page) {

		bridge->driver->agp_unmap_page(bridge->scratch_page_page,

					       bridge->scratch_page_dma);

	}

err_out_nounmap:

	if (bridge->driver->needs_scratch_page) {

	if (bridge->driver->needs_scratch_page) {

		void *va = page_address(bridge->scratch_page_page);

		void *va = page_address(bridge->scratch_page_page);
@@ -240,10 +224,6 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge) 
	    bridge->driver->needs_scratch_page) {

	    bridge->driver->needs_scratch_page) {

		void *va = page_address(bridge->scratch_page_page);

		void *va = page_address(bridge->scratch_page_page);





		if (bridge->driver->agp_unmap_page)

			bridge->driver->agp_unmap_page(bridge->scratch_page_page,

						       bridge->scratch_page_dma);



		bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_UNMAP);

		bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_UNMAP);

		bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE);

		bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE);

	}

	}