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

video/rockchip: rga: fix the memory issue of put dmabuf impropriety

Browse Source 
Since commit 5b498b994 put dma buf while rga engine just do this work.
When user reuse a buffer while rga engine is just doing a work
with this bufer it may cause memory issue.

Fixes: 5b498b9947 ("video/rockchip:rga: fix unsupported to scaling less than 1/2")
Change-Id: I5f19f5f3a175bbda78538e7747aa6626af17145e
Signed-off-by: Shixiang Zheng <shixiang.zheng@rock-chips.com>
This commit is contained in:
Shixiang Zheng
2018-12-17 09:57:29 +08:00
committed by Tao Huang
parent d62f2b0035
commit eda78bd723
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/video/rockchip/rga/rga_drv.c
View File

@@ -1285,8 +1285,15 @@ static struct rga_reg *rga_reg_init_2(rga_session *session, struct rga_req *req0
break;
}
}
RGA_gen_reg_info(req1, (uint8_t *)reg1->cmd_reg);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
reg1->sg_src = req1->sg_src;
reg1->sg_dst = req1->sg_dst;
reg1->attach_src = req1->attach_src;
reg1->attach_dst = req1->attach_dst;
#endif
mutex_lock(&rga_service.lock);
list_add_tail(&reg0->status_link, &rga_service.waiting);
list_add_tail(&reg0->session_link, &session->waiting);
@@ -1403,10 +1410,8 @@ static int rga_blit(rga_session *session, struct rga_req *req)
reg = rga_reg_init_2(session, req, &req2);
if (!reg) {
pr_err("init2 reg fail\n");
rga_put_dma_buf(&req2, NULL);
goto err_put_dma_buf;
}
rga_put_dma_buf(&req2, NULL);
num = 2;
} else {
/* check value if legal */