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

Commit f692775d authored by David Woodhouse's avatar David Woodhouse
Browse files

intel-agp: fix sglist allocation to avoid vmalloc() 



Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 91b8e305

drivers/char/agp/intel-agp.c

+10 −19
Original line number Original line Diff line number Diff line
@@ -198,39 +198,30 @@ static void intel_agp_unmap_page(struct page *page, dma_addr_t dma) 




static void intel_agp_free_sglist(struct agp_memory *mem)

static void intel_agp_free_sglist(struct agp_memory *mem)

{

{

	struct sg_table st;



	st.sgl = mem->sg_list;

	st.orig_nents = st.nents = mem->page_count;



	sg_free_table(&st);





	if (mem->sg_vmalloc_flag)

		vfree(mem->sg_list);

	else

		kfree(mem->sg_list);

	mem->sg_vmalloc_flag = 0;

	mem->sg_list = NULL;

	mem->sg_list = NULL;

	mem->num_sg = 0;

	mem->num_sg = 0;

}

}





static int intel_agp_map_memory(struct agp_memory *mem)

static int intel_agp_map_memory(struct agp_memory *mem)

{

{

	struct sg_table st;

	struct scatterlist *sg;

	struct scatterlist *sg;

	int i;

	int i;





	DBG("try mapping %lu pages\n", (unsigned long)mem->page_count);

	DBG("try mapping %lu pages\n", (unsigned long)mem->page_count);





	if ((mem->page_count * sizeof(*mem->sg_list)) < 2*PAGE_SIZE)

	if (sg_alloc_table(&st, mem->page_count, GFP_KERNEL))

		mem->sg_list = kcalloc(mem->page_count, sizeof(*mem->sg_list),

				       GFP_KERNEL);



	if (mem->sg_list == NULL) {

		mem->sg_list = vmalloc(mem->page_count * sizeof(*mem->sg_list));

		mem->sg_vmalloc_flag = 1;

	}



	if (!mem->sg_list) {

		mem->sg_vmalloc_flag = 0;

		return -ENOMEM;

		return -ENOMEM;

	}

	sg_init_table(mem->sg_list, mem->page_count);





	sg = mem->sg_list;

	mem->sg_list = sg = st.sgl;



	for (i = 0 ; i < mem->page_count; i++, sg = sg_next(sg))

	for (i = 0 ; i < mem->page_count; i++, sg = sg_next(sg))

		sg_set_page(sg, mem->pages[i], PAGE_SIZE, 0);

		sg_set_page(sg, mem->pages[i], PAGE_SIZE, 0);

include/linux/agp_backend.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,6 @@ struct agp_memory { 
	bool is_bound;

	bool is_bound;

	bool is_flushed;

	bool is_flushed;

	bool vmalloc_flag;

	bool vmalloc_flag;

	bool sg_vmalloc_flag;

	/* list of agp_memory mapped to the aperture */

	/* list of agp_memory mapped to the aperture */

	struct list_head mapped_list;

	struct list_head mapped_list;

	/* DMA-mapped addresses */

	/* DMA-mapped addresses */