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

drm/rockchip: add support for src1

Browse Source 
Although libdrm didn't implment src1, we should support it in driver in advance.

Change-Id: I7da051d1376ded63750f3363f9dd37fe6937a81c
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
This commit is contained in:
Jacob Chen
2017-03-13 18:09:56 +08:00
committed by Huang, Tao
parent 88267760e9
commit 3a03958f96
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,10 +221,12 @@ static int rga_check_reg_offset(struct device *dev,
switch (reg) {
case RGA_BUF_TYPE_GEMFD | RGA_DST_Y_RGB_BASE_ADDR:
case RGA_BUF_TYPE_GEMFD | RGA_SRC_Y_RGB_BASE_ADDR:
case RGA_BUF_TYPE_GEMFD | RGA_SRC1_RGB_BASE_ADDR:
break;
case RGA_BUF_TYPE_USERPTR | RGA_DST_Y_RGB_BASE_ADDR:
case RGA_BUF_TYPE_USERPTR | RGA_SRC_Y_RGB_BASE_ADDR:
case RGA_BUF_TYPE_USERPTR | RGA_SRC1_RGB_BASE_ADDR:
goto err;
default:
@@ -327,6 +329,16 @@ static int rga_map_cmdlist_gem(struct rockchip_rga *rga,
int index = cmdlist->last - 2 * (i + 1);
switch (cmdlist->data[index]) {
case RGA_SRC1_RGB_BASE_ADDR | RGA_BUF_TYPE_GEMFD:
fd = cmdlist->data[index + 1];
attach = rga_gem_buf_to_pages(rga, &mmu_pages, fd);
if (IS_ERR(attach))
return PTR_ERR(attach);
cmdlist->src1_attach = attach;
cmdlist->src1_mmu_pages = mmu_pages;
break;
case RGA_SRC_Y_RGB_BASE_ADDR | RGA_BUF_TYPE_GEMFD:
fd = cmdlist->data[index + 1];
attach = rga_gem_buf_to_pages(rga, &mmu_pages, fd);
@@ -366,6 +378,14 @@ static void rga_unmap_cmdlist_gem(struct rockchip_rga *rga,
}
node->cmdlist.src_attach = NULL;
attach = node->cmdlist.src1_attach;
if (attach) {
dma_buf = attach->dmabuf;
dma_buf_detach(dma_buf, attach);
dma_buf_put(dma_buf);
}
node->cmdlist.src1_attach = NULL;
attach = node->cmdlist.dst_attach;
if (attach) {
dma_buf = attach->dmabuf;

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

@@ -14,6 +14,7 @@ struct rga_cmdlist {
void *dst_mmu_pages;
void *src1_mmu_pages;
struct dma_buf_attachment *src_attach;
struct dma_buf_attachment *src1_attach;
struct dma_buf_attachment *dst_attach;
};