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

vdin: tl1 1g platform,hdmi in black screen [1/1]

Browse Source 
PD#SWPL-9473

Problem:
vdec cann't release memory in time

Solution:
add retry mechanism for allocate mem fail

Verify:
verified by t962x2_x301

Change-Id: If75e81c75da067bdbbd641614c7d2b2dbdc3799a
Signed-off-by: zhiwei.yuan <zhiwei.yuan@amlogic.com>
This commit is contained in:
zhiwei.yuan
2019-06-25 14:54:37 +08:00
committed by Tao Zeng
parent 1d4321a857
commit db92e0a32b
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/amlogic/media/vin/tvin/vdin/vdin_canvas.c
View File

@@ -22,6 +22,7 @@
#include <linux/cma.h>
#include <linux/amlogic/media/codec_mm/codec_mm.h>
#include <linux/dma-contiguous.h>
#include <linux/delay.h>
/* Amlogic headers */
#include <linux/amlogic/media/vfm/vframe.h>
@@ -422,7 +423,7 @@ unsigned int vdin_cma_alloc(struct vdin_dev_s *devp)
int flags = CODEC_MM_FLAGS_CMA_FIRST|CODEC_MM_FLAGS_CMA_CLEAR|
CODEC_MM_FLAGS_DMA;
unsigned int max_buffer_num = min_buf_num;
unsigned int i;
unsigned int i, j;
/*head_size:3840*2160*3*9/32*/
unsigned int afbce_head_size_byte = PAGE_SIZE * 1712;
/*afbce map_table need 218700 byte at most*/
@@ -556,6 +557,21 @@ unsigned int vdin_cma_alloc(struct vdin_dev_s *devp)
for (i = 0; i < max_buffer_num; i++) {
devp->vfmem_start[i] = codec_mm_alloc_for_dma(vdin_name,
devp->vfmem_size/PAGE_SIZE, 0, flags);
/*add for 1g config, codec can't release mem in time*/
for (j = 0; j < 20; j++) {
if (devp->vfmem_start[i] == 0) {
msleep(50);
pr_err("alloc mem fail:50*%dms\n", j);
devp->vfmem_start[i] =
codec_mm_alloc_for_dma
(vdin_name,
devp->vfmem_size/PAGE_SIZE, 0,
flags);
} else
break;
}
if (devp->vfmem_start[i] == 0) {
pr_err("\nvdin%d buf[%d]codec alloc fail!!!\n",
devp->index, i);