Skip to content

Commit 157b653

Browse files
Yu Qiaoweirkhuangtao
authored andcommitted
video/rockchip: rga2: Fix a crash cause by rga timeout.
Because update_patten_buff_mode is not currently used, it is removed. Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com> Change-Id: I48c97e75d27d475eee528ed6c838c67fdaa430f8
1 parent 538b77b commit 157b653

2 files changed

Lines changed: 13 additions & 0 deletions

File tree

drivers/video/rockchip/rga2/rga2_drv.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,9 @@ static void rga2_del_running_list_timeout(void)
10761076
while (!list_empty(&rga2_service.running)) {
10771077
reg = list_entry(rga2_service.running.next, struct rga2_reg,
10781078
status_link);
1079+
#if 0
10791080
kfree(reg->MMU_base);
1081+
#endif
10801082
if (reg->MMU_len && tbuf) {
10811083
if (tbuf->back + reg->MMU_len > 2 * tbuf->size)
10821084
tbuf->back = reg->MMU_len + tbuf->size;

drivers/video/rockchip/rga2/rga2_mmu_info.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,6 +1128,14 @@ static int rga2_mmu_info_update_palette_table_mode(struct rga2_reg *reg, struct
11281128
return status;
11291129
}
11301130

1131+
/*
1132+
* yqw:
1133+
* This function is currently not sure whether rga2 is used,
1134+
* because invalidate/clean cache occupies the parameter
1135+
* reg->MMU_base, so block this function first, and re-implement
1136+
* this function if necessary.
1137+
*/
1138+
#if 0
11311139
static int rga2_mmu_info_update_patten_buff_mode(struct rga2_reg *reg, struct rga2_req *req)
11321140
{
11331141
int SrcMemSize, CMDMemSize;
@@ -1207,6 +1215,7 @@ static int rga2_mmu_info_update_patten_buff_mode(struct rga2_reg *reg, struct rg
12071215

12081216
return status;
12091217
}
1218+
#endif
12101219

12111220
int rga2_set_mmu_info(struct rga2_reg *reg, struct rga2_req *req)
12121221
{
@@ -1230,9 +1239,11 @@ int rga2_set_mmu_info(struct rga2_reg *reg, struct rga2_req *req)
12301239
case update_palette_table_mode :
12311240
ret = rga2_mmu_info_update_palette_table_mode(reg, req);
12321241
break;
1242+
#if 0
12331243
case update_patten_buff_mode :
12341244
ret = rga2_mmu_info_update_patten_buff_mode(reg, req);
12351245
break;
1246+
#endif
12361247
default :
12371248
ret = -1;
12381249
break;

0 commit comments

Comments
 (0)