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 "dma-buf: system_heap: fix compile warning"

Browse Source 
This reverts commit 9d91ed824a.
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: Ibb891bd5d9c8a1a56208b8b39402b9b7b04bdd4f
This commit is contained in:
Tao Huang
2022-09-24 09:17:26 +08:00
parent 1f9114b0ba
commit d2c32e14b6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -270,6 +270,7 @@ system_heap_dma_buf_begin_cpu_access_partial(struct dma_buf *dmabuf,
unsigned int len)
{
struct system_heap_buffer *buffer = dmabuf->priv;
struct sg_table *table = &buffer->sg_table;
struct dma_heap_attachment *a;
int ret = 0;
@@ -279,7 +280,6 @@ system_heap_dma_buf_begin_cpu_access_partial(struct dma_buf *dmabuf,
mutex_lock(&buffer->lock);
if (IS_ENABLED(CONFIG_SYSTEM_HEAP_FORCE_DMA_SYNC)) {
struct dma_heap *heap = buffer->heap;
struct sg_table *table = &buffer->sg_table;
ret = system_heap_sgl_sync_range(dma_heap_get_dev(heap),
table->sgl,
@@ -318,13 +318,13 @@ system_heap_dma_buf_end_cpu_access_partial(struct dma_buf *dmabuf,
unsigned int len)
{
struct system_heap_buffer *buffer = dmabuf->priv;
struct sg_table *table = &buffer->sg_table;
struct dma_heap_attachment *a;
int ret = 0;
mutex_lock(&buffer->lock);
if (IS_ENABLED(CONFIG_SYSTEM_HEAP_FORCE_DMA_SYNC)) {
struct dma_heap *heap = buffer->heap;
struct sg_table *table = &buffer->sg_table;
ret = system_heap_sgl_sync_range(dma_heap_get_dev(heap),
table->sgl,