projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bb68181
)
vdin: record video, video display green screen [1/1]
author
Yong Qin
<yong.qin@amlogic.com>
Thu, 13 Jun 2019 03:02:10 +0000
(11:02 +0800)
committer
Tao Zeng
<tao.zeng@amlogic.com>
Fri, 14 Jun 2019 06:58:54 +0000
(23:58 -0700)
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 <yong.qin@amlogic.com>
drivers/amlogic/media/vin/tvin/vdin/vdin_canvas.c
patch
|
blob
|
history
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
(file)
--- 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++) {