From 44b1050e6ce9f484724d88db8d338e3aa9651548 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 13 Sep 2012 17:11:32 +0000 Subject: [PATCH] r600g: Fix bug when adding new items to the compute memory pool 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. --- .../drivers/r600/compute_memory_pool.c | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/r600/compute_memory_pool.c b/src/gallium/drivers/r600/compute_memory_pool.c index 04f0be17c56..04d24f6cbd3 100644 --- a/src/gallium/drivers/r600/compute_memory_pool.c +++ b/src/gallium/drivers/r600/compute_memory_pool.c @@ -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 { -- 2.30.2