fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 15:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600g: Fix bug when adding new items to the compute memory pool

Browse source 
The items are ordered in the item list by their offsets, with the lowest
offset coming first in the list.  The old code was assuming that new
items being added to the list would always have a greater offset than
the first item in the list, however this is not always the case.
This commit is contained in:
Tom Stellard 2012-09-13 17:11:32 +00:00
parent eacca90f43
commit 44b1050e6c
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/gallium/drivers/r600/compute_memory_pool.c
View file

@ -135,6 +135,11 @@ struct compute_memory_item* compute_memory_postalloc_chunk(
COMPUTE_DBG("* compute_memory_postalloc_chunck() start_in_dw = %ld\n",
start_in_dw);
/* Check if we can insert it in the front of the list */
if (pool->item_list && pool->item_list->start_in_dw > start_in_dw) {
return NULL;
}
for (item = pool->item_list; item; item = item->next) {
if (item->next) {
if (item->start_in_dw < start_in_dw
@ -336,12 +341,24 @@ void compute_memory_finalize_pending(struct compute_memory_pool* pool,
struct compute_memory_item *pos;
pos = compute_memory_postalloc_chunk(pool, start_in_dw);
item->prev = pos;
item->next = pos->next;
pos->next = item;
if (item->next) {
item->next->prev = item;
if (pos) {
item->prev = pos;
item->next = pos->next;
pos->next = item;
if (item->next) {
item->next->prev = item;
}
} else {
/* Add item to the front of the list */
item->next = pool->item_list->next;
if (pool->item_list->next) {
pool->item_list->next->prev = item;
}
item->prev = pool->item_list->prev;
if (pool->item_list->prev) {
pool->item_list->prev->next = item;
}
pool->item_list = item;
}
}
else {