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

di: "DI: di_init_buf vmap fail" is seen when power on [1/1]

Browse Source 
PD#SWPL-5908

Problem:
execute vmap when di reserved memory is disable

Solution:
skip memory calculation in init buf  while using cma

Verify:
verified by t962x2_x301

Change-Id: Ib0c2e422f61f2b4182109cb7bbb3107029363ce0
Signed-off-by: zhiwei.yuan <zhiwei.yuan@amlogic.com>
This commit is contained in:
zhiwei.yuan
2019-03-14 14:31:38 +08:00
committed by Tao Zeng
parent c3c9fb95af
commit 2c8ed09c51
1 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
drivers/amlogic/media/deinterlace/deinterlace.c
View File

@@ -2240,46 +2240,62 @@ static int di_init_buf(int width, int height, unsigned char prog_flag)
if (prog_flag) { if (prog_flag) {
di_buf->canvas_height = canvas_height; di_buf->canvas_height = canvas_height;
di_buf->nr_adr = de_devp->mem_start +
di_buf_size * i; //use reserved memory
if (de_devp->flag_cma == 0)
di_buf->nr_adr = de_devp->mem_start +
di_buf_size * i;
di_buf->canvas_config_flag = 1; di_buf->canvas_config_flag = 1;
} else { } else {
di_buf->canvas_height = (canvas_height>>1); di_buf->canvas_height = (canvas_height>>1);
di_buf->canvas_height = di_buf->canvas_height =
roundup(di_buf->canvas_height, roundup(di_buf->canvas_height,
canvas_align_width); canvas_align_width);
di_buf->nr_adr = de_devp->mem_start +
di_buf_size * i;
di_buf->mtn_adr = de_devp->mem_start +
di_buf_size * i +
nr_size;
di_buf->cnt_adr = de_devp->mem_start +
di_buf_size * i +
nr_size + mtn_size;
if (mc_mem_alloc) { //use reserved memory
di_buf->mcvec_adr = de_devp->mem_start + if (de_devp->flag_cma == 0) {
di_buf->nr_adr = de_devp->mem_start +
di_buf_size * i;
di_buf->mtn_adr = de_devp->mem_start +
di_buf_size * i + di_buf_size * i +
nr_size + mtn_size + count_size; nr_size;
di_buf->mcinfo_adr = di_buf->cnt_adr = de_devp->mem_start +
de_devp->mem_start + di_buf_size * i +
di_buf_size * i + nr_size + nr_size + mtn_size;
mtn_size + count_size + mv_size;
tmp = di_vmap(di_buf->mcinfo_adr, if (mc_mem_alloc) {
di_pre_stru.mcinfo_size, di_buf->mcvec_adr =
&di_buf->bflg_vmap); de_devp->mem_start +
di_buf_size * i +
nr_size + mtn_size +
count_size;
di_buf->mcinfo_adr =
de_devp->mem_start +
di_buf_size * i +
nr_size +
mtn_size +
count_size + mv_size;
tmp = di_vmap(
di_buf->mcinfo_adr,
di_pre_stru.
mcinfo_size,
&di_buf->bflg_vmap);
if (di_buf->bflg_vmap == true) if (di_buf->bflg_vmap == true)
di_buf->mcinfo_vaddr = di_buf->mcinfo_vaddr =
(unsigned short *)tmp; (unsigned short *)tmp;
else { else {
di_buf->mcinfo_vaddr = NULL; di_buf->mcinfo_vaddr = NULL;
pr_err("DI: %s vmap fail\n", pr_err("DI: %s vmap fail\n",
__func__); __func__);
} }
}
} }
di_buf->canvas_config_flag = 2; di_buf->canvas_config_flag = 2;
} }
di_buf->index = i; di_buf->index = i;
di_buf->vframe = &(vframe_local[i]); di_buf->vframe = &(vframe_local[i]);
di_buf->vframe->private_data = di_buf; di_buf->vframe->private_data = di_buf;
@@ -2299,8 +2315,11 @@ static int di_init_buf(int width, int height, unsigned char prog_flag)
up(&di_sema); up(&di_sema);
} }
#endif #endif
di_post_mem = de_devp->mem_start +
di_buf_size*de_devp->buf_num_avail; //use reserved memory
if (de_devp->flag_cma == 0)
di_post_mem = de_devp->mem_start +
di_buf_size*de_devp->buf_num_avail;
if (post_wr_en && post_wr_support) { if (post_wr_en && post_wr_support) {
di_post_buf_size = nr_width * canvas_height * 2; di_post_buf_size = nr_width * canvas_height * 2;
/* pre buffer must 2 more than post buffer */ /* pre buffer must 2 more than post buffer */
@@ -2348,8 +2367,11 @@ static int di_init_buf(int width, int height, unsigned char prog_flag)
(nr_width << 1); (nr_width << 1);
di_buf->canvas_height = canvas_height; di_buf->canvas_height = canvas_height;
di_buf->canvas_config_flag = 1; di_buf->canvas_config_flag = 1;
di_buf->nr_adr = di_post_mem +
di_post_buf_size*i; //use reserved memory
if (de_devp->flag_cma == 0)
di_buf->nr_adr = di_post_mem +
di_post_buf_size*i;
} }
queue_in(di_buf, QUEUE_POST_FREE); queue_in(di_buf, QUEUE_POST_FREE);
} }