shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: dma-buf: system_heap: allocate from dma32_pool for dma32* heap"

Browse Source 
This reverts commit 383018f42d.
Use rk_system_heap.c instead of system_heap.c now, reverts all changes.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I27099b713ac3249acb628868c7255c51b2881371
This commit is contained in:
Tao Huang
2022-09-24 09:17:49 +08:00
parent d2c32e14b6
commit 83065feb35
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/dma-buf/heaps/system_heap.c
View File

@@ -519,22 +519,18 @@ static const struct dma_buf_ops system_heap_buf_ops = {
.release = system_heap_dma_buf_release,
};
static struct page *system_heap_alloc_largest_available(struct dma_heap *heap,
unsigned long size,
unsigned int max_order)
static struct page *alloc_largest_available(unsigned long size,
unsigned int max_order)
{
struct page *page;
int i;
const char *name = dma_heap_get_name(heap);
struct dmabuf_page_pool **pool;
pool = strstr(name, "dma32") ? dma32_pools : pools;
for (i = 0; i < NUM_ORDERS; i++) {
if (size < (PAGE_SIZE << orders[i]))
continue;
if (max_order < orders[i])
continue;
page = dmabuf_page_pool_alloc(pool[i]);
page = dmabuf_page_pool_alloc(pools[i]);
if (!page)
continue;
return page;
@@ -587,7 +583,7 @@ static struct dma_buf *system_heap_do_allocate(struct dma_heap *heap,
if (fatal_signal_pending(current))
goto free_buffer;
page = system_heap_alloc_largest_available(heap, size_remaining, max_order);
page = alloc_largest_available(size_remaining, max_order);
if (!page)
goto free_buffer;