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

video: rockchip: mpp: Modify mpp_dma interface

Browse Source 
Change-Id: Ia7b45daaa120a1f3bbb3adf9c2decda4f71d8c60
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Ding Wei
2021-03-15 15:19:46 +08:00
committed by Herman Chen
parent 444d1b0a64
commit d15513be2c
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/video/rockchip/mpp/mpp_iommu.c
View File

@@ -125,7 +125,7 @@ int mpp_dma_release_fd(struct mpp_dma_session *dma, int fd)
}
struct mpp_dma_buffer *
mpp_dma_alloc(struct mpp_dma_session *dma, size_t size)
mpp_dma_alloc(struct device *dev, size_t size)
{
size_t align_size;
dma_addr_t iova;
@@ -136,15 +136,13 @@ mpp_dma_alloc(struct mpp_dma_session *dma, size_t size)
return NULL;
align_size = PAGE_ALIGN(size);
buffer->vaddr = dma_alloc_coherent(dma->dev,
align_size,
&iova,
GFP_KERNEL);
buffer->vaddr = dma_alloc_coherent(dev, align_size, &iova, GFP_KERNEL);
if (!buffer->vaddr)
goto fail_dma_alloc;
buffer->size = PAGE_ALIGN(size);
buffer->size = align_size;
buffer->iova = iova;
buffer->dev = dev;
return buffer;
fail_dma_alloc:
@@ -152,14 +150,15 @@ fail_dma_alloc:
return NULL;
}
int mpp_dma_free(struct mpp_dma_session *dma,
struct mpp_dma_buffer *buffer)
int mpp_dma_free(struct mpp_dma_buffer *buffer)
{
dma_free_coherent(dma->dev, buffer->size,
buffer->vaddr, buffer->iova);
dma_free_coherent(buffer->dev, buffer->size,
buffer->vaddr, buffer->iova);
buffer->vaddr = NULL;
buffer->iova = 0;
buffer->size = 0;
buffer->dev = NULL;
kfree(buffer);
return 0;
}

7
drivers/video/rockchip/mpp/mpp_iommu.h
View File

@@ -33,6 +33,8 @@ struct mpp_dma_buffer {
struct kref ref;
ktime_t last_used;
/* alloc by device */
struct device *dev;
};
struct mpp_dma_session {
@@ -74,9 +76,8 @@ mpp_dma_session_create(struct device *dev);
int mpp_dma_session_destroy(struct mpp_dma_session *dma);
struct mpp_dma_buffer *
mpp_dma_alloc(struct mpp_dma_session *dma, size_t size);
int mpp_dma_free(struct mpp_dma_session *dma,
struct mpp_dma_buffer *buffer);
mpp_dma_alloc(struct device *dev, size_t size);
int mpp_dma_free(struct mpp_dma_buffer *buffer);
struct mpp_dma_buffer *
mpp_dma_import_fd(struct mpp_iommu_info *iommu_info,