intel/agp: rewrite GTT on resume
On my Intel chipset (965GM), the GTT is entirely erased across suspend/resume. This patch simply re-plays the current mapping at resume time to restore the table.=20 I noticed this once I started relying on persistent GTT mappings across VT switch in our GEM work -- the old X server and DRM code carefully unbind all memory from the GTT on VT switch, but GEM does not bother. I placed the list management and rewrite code in the generic layer on the assumption that it will be needed on other hardware, but I did not add the rewrite call to anything other than the Intel resume function. Keep a list of current GATT mappings. At resume time, rewrite them into the GATT. This is needed on Intel (at least) as the entire GATT is cleared across suspend/resume. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Keith Packard <keithp@keithp.com> Cc: Dave Jones <davej@codemonkey.org.uk> Cc: Andi Kleen <andi@firstfloor.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:

committed by
Dave Airlie

parent
e3cf69511a
commit
a8c84df9f7
@@ -429,6 +429,10 @@ int agp_bind_memory(struct agp_memory *curr, off_t pg_start)
|
||||
|
||||
curr->is_bound = true;
|
||||
curr->pg_start = pg_start;
|
||||
spin_lock(&agp_bridge->mapped_lock);
|
||||
list_add(&curr->mapped_list, &agp_bridge->mapped_list);
|
||||
spin_unlock(&agp_bridge->mapped_lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(agp_bind_memory);
|
||||
@@ -461,10 +465,34 @@ int agp_unbind_memory(struct agp_memory *curr)
|
||||
|
||||
curr->is_bound = false;
|
||||
curr->pg_start = 0;
|
||||
spin_lock(&curr->bridge->mapped_lock);
|
||||
list_del(&curr->mapped_list);
|
||||
spin_unlock(&curr->bridge->mapped_lock);
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(agp_unbind_memory);
|
||||
|
||||
/**
|
||||
* agp_rebind_emmory - Rewrite the entire GATT, useful on resume
|
||||
*/
|
||||
int agp_rebind_memory(void)
|
||||
{
|
||||
struct agp_memory *curr;
|
||||
int ret_val = 0;
|
||||
|
||||
spin_lock(&agp_bridge->mapped_lock);
|
||||
list_for_each_entry(curr, &agp_bridge->mapped_list, mapped_list) {
|
||||
ret_val = curr->bridge->driver->insert_memory(curr,
|
||||
curr->pg_start,
|
||||
curr->type);
|
||||
if (ret_val != 0)
|
||||
break;
|
||||
}
|
||||
spin_unlock(&agp_bridge->mapped_lock);
|
||||
return ret_val;
|
||||
}
|
||||
EXPORT_SYMBOL(agp_rebind_memory);
|
||||
|
||||
/* End - Routines for handling swapping of agp_memory into the GATT */
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user