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

video/rockchip: rga2: Fix MMU base not shift forward.

Browse Source 
Since the MMU base is not shifted forward, when the sync/async mode
is called together, the same memory is used to store the page table,
resulting in data errors.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: If4807da8159e98a8d807cc24b4d6533793eeefa8
This commit is contained in:
Yu Qiaowei
2021-07-23 09:53:16 +08:00
committed by Tao Huang
parent c4bac4aa0b
commit 6d3cc78d0e
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/video/rockchip/rga2/rga2_mmu_info.c
View File

@@ -731,14 +731,18 @@ static int rga2_mmu_info_BitBlt_mode(struct rga2_reg *reg, struct rga2_req *req)
status = RGA2_MALLOC_ERROR;
goto out;
}
pages = rga2_mmu_buf.pages;
mutex_lock(&rga2_service.lock);
MMU_Base = rga2_mmu_buf.buf_virtual +
(rga2_mmu_buf.front & (rga2_mmu_buf.size - 1));
MMU_Base_phys = rga2_mmu_buf.buf +
(rga2_mmu_buf.front & (rga2_mmu_buf.size - 1));
mutex_unlock(&rga2_service.lock);
pages = rga2_mmu_buf.pages;
if(pages == NULL) {
pr_err("RGA MMU malloc pages mem failed\n");
return -EINVAL;
}
mutex_lock(&rga2_service.lock);
MMU_Base = rga2_mmu_buf.buf_virtual + rga2_mmu_buf.front;
MMU_Base_phys = rga2_mmu_buf.buf + rga2_mmu_buf.front;
mutex_unlock(&rga2_service.lock);
if (Src0MemSize) {
if (req->sg_src0) {
ret = rga2_MapION(req->sg_src0,
@@ -947,8 +951,8 @@ static int rga2_mmu_info_color_palette_mode(struct rga2_reg *reg, struct rga2_re
}
mutex_lock(&rga2_service.lock);
MMU_Base = rga2_mmu_buf.buf_virtual + (rga2_mmu_buf.front & (rga2_mmu_buf.size - 1));
MMU_Base_phys = rga2_mmu_buf.buf + (rga2_mmu_buf.front & (rga2_mmu_buf.size - 1));
MMU_Base = rga2_mmu_buf.buf_virtual + rga2_mmu_buf.front;
MMU_Base_phys = rga2_mmu_buf.buf + rga2_mmu_buf.front;
mutex_unlock(&rga2_service.lock);
if(SrcMemSize) {
@@ -1039,6 +1043,7 @@ static int rga2_mmu_info_color_fill_mode(struct rga2_reg *reg, struct rga2_req *
DstMemSize = 0;
DstPageCount = 0;
DstStart = 0;
MMU_Base = NULL;
do {
@@ -1054,17 +1059,21 @@ static int rga2_mmu_info_color_fill_mode(struct rga2_reg *reg, struct rga2_req *
DstMemSize = (DstPageCount + 15) & (~15);
AllSize = DstMemSize;
pages = rga2_mmu_buf.pages;
if(rga2_mmu_buf_get_try(&rga2_mmu_buf, AllSize)) {
pr_err("RGA2 Get MMU mem failed\n");
status = RGA2_MALLOC_ERROR;
break;
}
pages = rga2_mmu_buf.pages;
if(pages == NULL) {
pr_err("RGA MMU malloc pages mem failed\n");
return -EINVAL;
}
mutex_lock(&rga2_service.lock);
MMU_Base_phys = rga2_mmu_buf.buf + (rga2_mmu_buf.front & (rga2_mmu_buf.size - 1));
MMU_Base = rga2_mmu_buf.buf_virtual + (rga2_mmu_buf.front & (rga2_mmu_buf.size - 1));
MMU_Base_phys = rga2_mmu_buf.buf + rga2_mmu_buf.front;
MMU_Base = rga2_mmu_buf.buf_virtual + rga2_mmu_buf.front;
mutex_unlock(&rga2_service.lock);
if (DstMemSize) {
@@ -1156,8 +1165,8 @@ static int rga2_mmu_info_update_palette_table_mode(struct rga2_reg *reg, struct
}
mutex_lock(&rga2_service.lock);
MMU_Base = rga2_mmu_buf.buf_virtual + (rga2_mmu_buf.front & (rga2_mmu_buf.size - 1));
MMU_Base_phys = rga2_mmu_buf.buf + (rga2_mmu_buf.front & (rga2_mmu_buf.size - 1));
MMU_Base = rga2_mmu_buf.buf_virtual + rga2_mmu_buf.front;
MMU_Base_phys = rga2_mmu_buf.buf + rga2_mmu_buf.front;
mutex_unlock(&rga2_service.lock);
if (LutMemSize) {