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

Commit 62369028 authored by Michel Dänzer's avatar Michel Dänzer Committed by Dave Airlie
Browse files

agp/uninorth: Handle user memory types. 



This adds support for TTM to the uninorth AGP bridge.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 46f4b3ea

drivers/char/agp/uninorth-agp.c

+16 −2
Original line number Diff line number Diff line
@@ -146,13 +146,20 @@ static int uninorth_insert_memory(struct agp_memory *mem, off_t pg_start, 
{

	int i, j, num_entries;

	void *temp;

	int mask_type;



	temp = agp_bridge->current_size;

	num_entries = A_SIZE_32(temp)->num_entries;



	if (type != 0 || mem->type != 0)

	if (type != mem->type)

		return -EINVAL;



	mask_type = agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type);

	if (mask_type != 0) {

		/* We know nothing of memory types */

		return -EINVAL;

	}



	if ((pg_start + mem->page_count) > num_entries)

		return -EINVAL;
@@ -184,13 +191,20 @@ static int u3_insert_memory(struct agp_memory *mem, off_t pg_start, int type) 
	int i, num_entries;

	void *temp;

	u32 *gp;

	int mask_type;



	temp = agp_bridge->current_size;

	num_entries = A_SIZE_32(temp)->num_entries;



	if (type != 0 || mem->type != 0)

	if (type != mem->type)

		return -EINVAL;



	mask_type = agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type);

	if (mask_type != 0) {

		/* We know nothing of memory types */

		return -EINVAL;

	}



	if ((pg_start + mem->page_count) > num_entries)

		return -EINVAL;