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

drm/rockchip: rga: replace primitive api with dma sync api

Browse Source 
Since rga is a dma-coherent device, we have to use drm bus
 device to call sync api.

Change-Id: Ia12062293fabba083c8ab9c4f7457e3167807bb9
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
This commit is contained in:
Jacob Chen
2017-03-27 16:15:11 +08:00
committed by Huang, Tao
parent 267df77d1d
commit ef2c18d228
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/gpu/drm/rockchip/rockchip_drm_rga.c
View File

@@ -51,16 +51,6 @@ static void __user *rga_compat_ptr(u64 value)
#endif
}
static void rga_dma_flush_range(void *ptr, int size)
{
#ifdef CONFIG_ARM
dmac_flush_range(ptr, ptr + size);
outer_flush_range(virt_to_phys(ptr), virt_to_phys(ptr + size));
#elif defined CONFIG_ARM64
__dma_flush_range(ptr, ptr + size);
#endif
}
static inline void rga_write(struct rockchip_rga *rga, u32 reg, u32 value)
{
writel(value, rga->regs + reg);
@@ -196,7 +186,9 @@ static int rga_alloc_dma_buf_for_cmdlist(struct rga_runqueue_node *runqueue)
dest[reg >> 2] = mmu_ctrl;
}
rga_dma_flush_range(cmdlist_pool_virt, cmdlist_cnt * RGA_CMDLIST_SIZE);
dma_sync_single_for_device(runqueue->drm_dev->dev,
virt_to_phys(cmdlist_pool_virt),
PAGE_SIZE, DMA_TO_DEVICE);
runqueue->cmdlist_dma_attrs = cmdlist_dma_attrs;
runqueue->cmdlist_pool_virt = cmdlist_pool_virt;
@@ -298,7 +290,8 @@ rga_gem_buf_to_pages(struct rockchip_rga *rga, void **mmu_pages, int fd)
mapped_size += len;
}
rga_dma_flush_range(pages, 32 * 1024);
dma_sync_single_for_device(rga->drm_dev->dev, virt_to_phys(pages),
8 * PAGE_SIZE, DMA_TO_DEVICE);
*mmu_pages = pages;
@@ -657,6 +650,7 @@ int rockchip_rga_exec_ioctl(struct drm_device *drm_dev, void *data,
return -ENOMEM;
}
runqueue->drm_dev = drm_dev;
runqueue->dev = rga->dev;
init_completion(&runqueue->complete);
@@ -696,6 +690,10 @@ static int rockchip_rga_open(struct drm_device *drm_dev, struct device *dev,
{
struct rockchip_drm_file_private *file_priv = file->driver_priv;
struct rockchip_drm_rga_private *rga_priv;
struct rockchip_rga *rga;
rga = dev_get_drvdata(dev);
rga->drm_dev = drm_dev;
rga_priv = kzalloc(sizeof(*rga_priv), GFP_KERNEL);
if (!rga_priv)

1
drivers/gpu/drm/rockchip/rockchip_drm_rga.h
View File

@@ -26,6 +26,7 @@ struct rga_cmdlist_node {
struct rga_runqueue_node {
struct list_head list;
struct drm_device *drm_dev;
struct device *dev;
pid_t pid;
struct drm_file *file;