mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
agp/uninorth: Handle user memory types.
This adds support for TTM to the uninorth AGP bridge. Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
46f4b3eab7
commit
62369028c7
1 changed files with 16 additions and 2 deletions
|
@ -146,13 +146,20 @@ static int uninorth_insert_memory(struct agp_memory *mem, off_t pg_start,
|
||||||
{
|
{
|
||||||
int i, j, num_entries;
|
int i, j, num_entries;
|
||||||
void *temp;
|
void *temp;
|
||||||
|
int mask_type;
|
||||||
|
|
||||||
temp = agp_bridge->current_size;
|
temp = agp_bridge->current_size;
|
||||||
num_entries = A_SIZE_32(temp)->num_entries;
|
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 */
|
/* We know nothing of memory types */
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
if ((pg_start + mem->page_count) > num_entries)
|
if ((pg_start + mem->page_count) > num_entries)
|
||||||
return -EINVAL;
|
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;
|
int i, num_entries;
|
||||||
void *temp;
|
void *temp;
|
||||||
u32 *gp;
|
u32 *gp;
|
||||||
|
int mask_type;
|
||||||
|
|
||||||
temp = agp_bridge->current_size;
|
temp = agp_bridge->current_size;
|
||||||
num_entries = A_SIZE_32(temp)->num_entries;
|
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 */
|
/* We know nothing of memory types */
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
if ((pg_start + mem->page_count) > num_entries)
|
if ((pg_start + mem->page_count) > num_entries)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue