From: Yong Qin Date: Thu, 13 Jun 2019 03:02:10 +0000 (+0800) Subject: vdin: record video, video display green screen [1/1] X-Git-Tag: khadas-vims-v0.9.6-release~344 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ea3ca70ab9381adef70e50770c233b696d0dc75;p=platform%2Fkernel%2Flinux-amlogic.git vdin: record video, video display green screen [1/1] PD#SWPL-9172 Problem: no more canvas id for vdin1 use Solution: the canvas id number need equal with frame number. Verify: tl1 Change-Id: Idff362218042c260c28116816d747260708f6355 Signed-off-by: Yong Qin --- diff --git a/drivers/amlogic/media/vin/tvin/vdin/vdin_canvas.c b/drivers/amlogic/media/vin/tvin/vdin/vdin_canvas.c index 1cfa6b1..cd48fce 100644 --- a/drivers/amlogic/media/vin/tvin/vdin/vdin_canvas.c +++ b/drivers/amlogic/media/vin/tvin/vdin/vdin_canvas.c @@ -332,6 +332,7 @@ void vdin_canvas_auto_config(struct vdin_dev_s *devp) pr_err("\nvdin%d canvas_max_num %d less than vfmem_max_cnt %d\n", devp->index, devp->canvas_max_num, devp->vfmem_max_cnt); } + devp->vfmem_max_cnt = min(devp->vfmem_max_cnt, devp->canvas_max_num); if (devp->set_canvas_manual == 1) { for (i = 0; i < 4; i++) {