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

rk: ion: update iovmm_map to rockchip_iovmm_map

Browse Source
This commit is contained in:
xxm
2014-08-08 11:00:38 +08:00
parent f1ac264d8f
commit 768c87ccb9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/android/ion/ion_cma_heap.c
View File

@@ -21,7 +21,7 @@
#include <linux/err.h>
#include <linux/dma-mapping.h>
#include <linux/rockchip_ion.h>
#include <linux/rockchip/iovmm.h>
#include <linux/rockchip-iovmm.h>
#include "ion.h"
#include "ion_priv.h"
@@ -204,11 +204,11 @@ static int ion_cma_map_iommu(struct ion_buffer *buffer,
int ret = 0;
struct ion_cma_buffer_info *info = buffer->priv_virt;
data->iova_addr = iovmm_map(iommu_dev, info->table->sgl, 0, iova_length);
data->iova_addr = rockchip_iovmm_map(iommu_dev, info->table->sgl, 0, iova_length);
pr_debug("%s: map %x -> %lx\n", __func__, info->table->sgl->dma_address,
data->iova_addr);
if (!data->iova_addr || IS_ERR_VALUE(data->iova_addr)) {
pr_err("%s: iovmm_map() failed: %lx\n", __func__, data->iova_addr);
pr_err("%s: rockchip_iovmm_map() failed: %lx\n", __func__, data->iova_addr);
ret = -EINVAL;
goto out;
}
@@ -222,7 +222,7 @@ out:
void ion_cma_unmap_iommu(struct device *iommu_dev, struct ion_iommu_map *data)
{
pr_debug("%s: unmap %x@%lx\n", __func__, data->mapped_size, data->iova_addr);
iovmm_unmap(iommu_dev, data->iova_addr);
rockchip_iovmm_unmap(iommu_dev, data->iova_addr);
return;
}

8
drivers/staging/android/ion/ion_system_heap.c
View File

@@ -23,7 +23,7 @@
#include <linux/seq_file.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/rockchip/iovmm.h>
#include <linux/rockchip-iovmm.h>
#include "ion.h"
#include "ion_priv.h"
@@ -260,10 +260,10 @@ static int ion_system_map_iommu(struct ion_buffer *buffer,
int ret = 0;
struct sg_table *table = (struct sg_table*)buffer->priv_virt;
data->iova_addr = iovmm_map(iommu_dev, table->sgl, 0, iova_length);
data->iova_addr = rockchip_iovmm_map(iommu_dev, table->sgl, 0, iova_length);
pr_debug("%s: map %x -> %lx\n", __func__, table->sgl->dma_address, data->iova_addr);
if (!data->iova_addr || IS_ERR_VALUE(data->iova_addr)) {
pr_err("%s: iovmm_map() failed: %lx\n", __func__, data->iova_addr);
pr_err("%s: rockchip_iovmm_map() failed: %lx\n", __func__, data->iova_addr);
ret = -EINVAL;
goto out;
}
@@ -277,7 +277,7 @@ out:
void ion_system_unmap_iommu(struct device *iommu_dev, struct ion_iommu_map *data)
{
pr_debug("%s: unmap %x@%lx\n", __func__, data->mapped_size, data->iova_addr);
iovmm_unmap(iommu_dev, data->iova_addr);
rockchip_iovmm_unmap(iommu_dev, data->iova_addr);
return;
}