samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dsp: msm_audio_ion: use dma_buf_vmap for mapping dma_buf to kernel

Browse Source 
Use the newly added dma_buf_vmap API for mapping a dma_buf
to kernel address space.

Change-Id: Idacada71eb827b4af96a793a180456ae910e30e8
Signed-off-by: Banajit Goswami <bgoswami@codeaurora.org>
This commit is contained in:
Banajit Goswami
2018-03-03 01:44:55 -08:00
parent 87f926a612
commit 80b67f4e39
1 changed files with 4 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
dsp/msm_audio_ion.c
View File

@@ -208,10 +208,8 @@ err:
static void *msm_audio_ion_map_kernel(struct dma_buf *dma_buf) static void *msm_audio_ion_map_kernel(struct dma_buf *dma_buf)
{ {
int i = 0;
int rc = 0; int rc = 0;
void *addr = NULL; void *addr = NULL;
unsigned int pg_cnt = 0;
struct msm_audio_alloc_data *alloc_data = NULL; struct msm_audio_alloc_data *alloc_data = NULL;
rc = dma_buf_begin_cpu_access(dma_buf, DMA_BIDIRECTIONAL); rc = dma_buf_begin_cpu_access(dma_buf, DMA_BIDIRECTIONAL);
@@ -220,30 +218,12 @@ static void *msm_audio_ion_map_kernel(struct dma_buf *dma_buf)
goto exit; goto exit;
} }
pg_cnt = dma_buf->size / PAGE_SIZE; addr = dma_buf_vmap(dma_buf);
if (dma_buf->size % PAGE_SIZE)
pg_cnt++;
if (pg_cnt == 0) {
pr_err("%s: Page count is NULL\n", __func__);
goto exit;
}
/* Map the first page, and store the address to addr */
addr = dma_buf_kmap(dma_buf, 0);
if (!addr) { if (!addr) {
pr_err("%s: mapping kernel buffer failed for page 0\n", pr_err("%s: kernel mapping of dma_buf failed\n",
__func__); __func__);
goto exit; goto exit;
} }
/* Map remaining pages */
for (i = 1; i < pg_cnt; i++) {
if (!dma_buf_kmap(dma_buf, i)) {
pr_err("%s: mapping kernel buffer failed for page %d\n",
__func__, i);
goto err;
}
}
/* /*
* TBD: remove the below section once new API * TBD: remove the below section once new API
@@ -259,20 +239,13 @@ static void *msm_audio_ion_map_kernel(struct dma_buf *dma_buf)
} }
mutex_unlock(&(msm_audio_ion_data.list_mutex)); mutex_unlock(&(msm_audio_ion_data.list_mutex));
return addr;
err:
for (; i > 0; i--)
dma_buf_kunmap(dma_buf, i - 1, addr);
addr = NULL;
exit: exit:
return addr; return addr;
} }
static void msm_audio_ion_unmap_kernel(struct dma_buf *dma_buf) static void msm_audio_ion_unmap_kernel(struct dma_buf *dma_buf)
{ {
int i, rc = 0; int rc = 0;
unsigned int pg_cnt = 0;
void *vaddr = NULL; void *vaddr = NULL;
struct msm_audio_alloc_data *alloc_data = NULL; struct msm_audio_alloc_data *alloc_data = NULL;
struct device *cb_dev = msm_audio_ion_data.cb_dev; struct device *cb_dev = msm_audio_ion_data.cb_dev;
@@ -298,12 +271,7 @@ static void msm_audio_ion_unmap_kernel(struct dma_buf *dma_buf)
goto err; goto err;
} }
pg_cnt = dma_buf->size / PAGE_SIZE; dma_buf_vunmap(dma_buf, vaddr);
if (dma_buf->size % PAGE_SIZE)
pg_cnt++;
for (i = 0; i < pg_cnt; i++)
dma_buf_kunmap(dma_buf, i, vaddr);
rc = dma_buf_end_cpu_access(dma_buf, DMA_BIDIRECTIONAL); rc = dma_buf_end_cpu_access(dma_buf, DMA_BIDIRECTIONAL);
if (rc) { if (rc) {