Evoke Zhang [Wed, 15 May 2019 02:10:45 +0000 (10:10 +0800)]
vout: add vout2 init mode support [1/1]
PD#TV-5428
Problem:
need viu2 display support
Solution:
add vout2 init mode support
Verify:
u200
Change-Id: Ibd9d2a07645645d739d7421ceafd386caf3066d7
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
Yong Qin [Thu, 23 May 2019 10:23:12 +0000 (18:23 +0800)]
vlock: verify hdmi pll from vlock for tm2 [1/1]
PD#SWPL-5620
Problem:
function verify. hdmi pll from vlock
Solution:
function verify
Verify:
tm2
Change-Id: I7b6d7ab93a1b1cf8f3ef6212d8b715e3bef44534
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
zhiwei.yuan [Fri, 10 May 2019 07:43:15 +0000 (15:43 +0800)]
vdin: G12A color space error when capture screen by post blend [1/1]
PD#SWPL-8335
Problem:
color space setting error
Solution:
set yuv444 when use viu1 post blend port
Verify:
verified by t962x2_x301
Change-Id: Ic92a6db92f6cec64084d140c5f505489579b294f
Signed-off-by: zhiwei.yuan <zhiwei.yuan@amlogic.com>
Jian Xu [Sun, 26 May 2019 07:05:05 +0000 (15:05 +0800)]
audio: auge: fix the samesource spdif clock recovery issue [1/1]
PD#SWPL-3667
Problem:
after playback none-48K raw audio, the spdif clock
is not recoved to 48K when tdm/spdif same source
Solution:
use the same clock source as tdm if samesource and
config that when tdm hardware prepare.
Verify:
u212
Change-Id: I2a847273ab0b920f6cee691ee0db006709ffde2a
Signed-off-by: Jian Xu <jian.xu@amlogic.com>
Jian Cao [Fri, 17 May 2019 14:39:59 +0000 (22:39 +0800)]
ge2d: add option for rgb_to_yuv to 709 or 601 [1/1]
PD#OTT-3711
Problem:
color parameters are wrong
while displaying images on NativeImagePlayer
Solution:
add a macro BT_STANDARD for 709 or 601
Verify:
verified on W400
Change-Id: I0703ef17748c8267b86e85a4366cac88d3e41ee1
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
Renjun Xu [Sat, 18 May 2019 06:19:47 +0000 (14:19 +0800)]
audio: modify loopback dts config for AVS [1/1]
PD#SWPL-8614
Problem:
AVS cannot wake up on Latest buildroot
Solution:
Enable 8ch pdm + 8ch loopback
Verify:
s420&s400
Change-Id: I93c87cc24fcbb8945f48a960383de47ad725e89e
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
Yong Qin [Fri, 24 May 2019 01:42:15 +0000 (09:42 +0800)]
vlock: for phase lock sometime can't lock [1/1]
PD#SWPL-8946
Problem:
vlock phase lock time is not accurate as theoretical value
Solution:
1.change the limite
2.increace the frq and phase lock window
3.lone time unlock, need retry
Verify:
tl1
Change-Id: I9d47bf83969ae060f0b957739ed4c859b85c83c8
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
Evoke Zhang [Wed, 22 May 2019 05:50:13 +0000 (13:50 +0800)]
cvbsout: add NTSC_M mode support [1/1]
PD#OTT-3953
Problem:
need ntsc_m mode support
Solution:
add NTSC_M mode support
Verify:
u200
Change-Id: I446862a1b9405c7acc4845d1d9116492c3e0ecca
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
Pengcheng Chen [Fri, 19 Apr 2019 03:20:34 +0000 (11:20 +0800)]
ge2d: ge2d cpu cost optimize [2/2]
PD#SWPL-7422
Problem:
ge2d ioctl have cpu usage issue
Solution:
1. dma buffer alloc gdc module,when dma buf exported, fd and phys
address can be recorded.driver can get phys address via fd internally.
2. dmabuf alloc by other driver module, need used gdc_dma_buffer_map/
gdc_dma_buffer_unmap to get phys address.
Verify:
Newman & W400 board
Change-Id: I78d03b52e574daf2e8b2d53eb8fdfde06357ebfe
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
Pengcheng Chen [Fri, 19 Apr 2019 02:58:19 +0000 (10:58 +0800)]
gdc: add gdc cpu cost optimize [1/2]
PD#SWPL-7422
Problem:
gdc ioctl have cpu usage issue
Solution:
1. dma buffer alloc gdc module,when dma buf exported, fd and phys
address can be recorded.driver can get phys address via fd internally.
2. dmabuf alloc by other driver module, need used gdc_dma_buffer_map/
gdc_dma_buffer_unmap to get phys address.
Verify:
Newman & W400 board
Change-Id: Ie270589a19dfae4fa750241fb5721154221f2448
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
yao liu [Wed, 22 May 2019 09:38:13 +0000 (17:38 +0800)]
dolby: set gmax for LL mode [1/1]
PD#SWPL-8799
Problem:
HDR-001-TC3 GXF is brighter than VID in LL mode
Solution:
dolby_vision_target_graphics_L for LL mode
Verify:
verified on u212
Change-Id: I3b39ec048bfff3d8ae797702c1c783356d59e604
Signed-off-by: yao liu <yao.liu@amlogic.com>
shuanglong.wang [Wed, 8 May 2019 02:32:19 +0000 (10:32 +0800)]
video: for beginning playback use small omx_pts_interval_upper [1/1]
PD#SWPL-8545
Problem:
AL1 slope problem
Solution:
for beginning playback, use small omx_pts_interval_upper and
omx_pts_dv_lower to let pcr adjust according to omxpts quickly. Also
omxpts compenstion use sched_clock instead of getimeofday.
Verify:
verify by nts
Change-Id: If9476a9793e3e5da691ea720de78f1c20f01a1e5
Signed-off-by: shuanglong.wang <shuanglong.wang@amlogic.com>
Gongwei Chen [Tue, 7 May 2019 12:57:20 +0000 (20:57 +0800)]
common: loudspeaker: adjust for yeke [1/1]
PD#SWPL-8201
Problem:
loudspeaker
ad82584f for yeke.
Solution:
loudspeaker
ad82584f for yeke.
Verify:
S905D2 u202.
Change-Id: I01fe62d207c47283e714937282a0ba24aef1d467
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>
Hanjie Lin [Thu, 13 Dec 2018 07:28:45 +0000 (15:28 +0800)]
arm: makefile: change text_offset to 0x108000 [1/1]
PD#SWPL-1505
PD#SWPL-8867
Problem:
Amlogic arm kernel text_offset is 0x208000,
ko start address to kernel text end address arrange is too big(>32M)
it can cause insmod ko failed.
Solution:
modify text_offset to 0x108000
first 0x100000 is invisibe to kernel.
Verify:
u200
Change-Id: I9684b108b57a15b03e4279146c1dc57667aa5d12
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
Blance Tang [Thu, 23 May 2019 02:28:50 +0000 (10:28 +0800)]
buildroot: Add W400 DRM buildroot DTS for G12B RevB [1/1]
PD#SWPL-8830
Problem:
Current W400 DRM buildroot DTS only for G12B RevA
Solution:
Add W400 DRM buildroot DTS for G12B RevB
Verify:
Local
Change-Id: I3e01a3b53fc8d399296f6a3d777d59e0a73060c7
Signed-off-by: Blance Tang <guofeng.tang@amlogic.com>
Wencai You [Thu, 23 May 2019 12:42:51 +0000 (20:42 +0800)]
thermal: check array index when set cur_state [1/1]
PD#SWPL-8747
Problem:
android.security.sts.Poc17_11#testPocCVE_2017_6264
test echo /sys/devices/virtual/thermal/cooling_device2/cur_state
crash
Solution:
check array index
Verify:
verified by u212
Change-Id: I235d62508d95fffaed7b811ba008384db7c7ec6f
Signed-off-by: Wencai You <wencai.you@amlogic.com>
jintao xu [Tue, 21 May 2019 11:47:32 +0000 (19:47 +0800)]
amvideo: set black_threshold_height default 48 [1/1]
PD#OTT-1836
Problem:
disable video when window is too small
Solution:
set black_threshold_height default 48
Verify:
U212
Change-Id: I9ed7deb54baef1c44bb9cc0c1a4d699140663864
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
Lei Qian [Thu, 23 May 2019 14:42:40 +0000 (22:42 +0800)]
vlock: fix GXL can't boot up issue [1/1]
PD#SWPL-8946
Prblem:
GXL can't boot up issue
Solution:
Revert "vlock: for phase lock sometime can't lock [1/1]"
This reverts commit
aecd88472a2c97a6793dad3e632001142f909878.
Verify:
verify by ampere
Change-Id: Ia272b379d67f84479a866b980c6f999bd7c42fa5
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
Zhe Wang [Thu, 23 May 2019 06:05:14 +0000 (14:05 +0800)]
audio: remove ddr managerment print for stress test [1/1]
PD#SWPL-8755
Problem:
too much print in stress test
Solution:
remove ddr managerment print for stress test
Verify:
Verified by x301
Change-Id: Ibd2835005da2664f623504a226562d2f8d9708ba
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
Brian Zhu [Wed, 22 May 2019 14:03:43 +0000 (22:03 +0800)]
vpp: set default aspect when the ratecontrol is zero [1/1]
PD#TV-5266
Problem:
Vpp used the wrong aspect ratio in 3D, screen mode = normal
and aspect ratio is 0 in ratecontrol variable.
Solution:
When the aspect ratio is 0, set the default value as
(height << 8) / width
Verify:
Verified by x301
Change-Id: I34f7cd3ce5ed1818d3090ebb4be934225038625e
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
Jianxiong Pan [Thu, 23 May 2019 02:38:03 +0000 (10:38 +0800)]
dts: change ftrace-size. [1/1]
PD#SWPL-6028
Problem:
add ftrace-size.
Solution:
add ftrace-size.
Verify:
no.
Change-Id: I42d34edf665632dfe29d04df192964238b8e3df8
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
Sandy Luo [Wed, 22 May 2019 15:34:13 +0000 (23:34 +0800)]
dts: tl1: change ftrace-size [1/1]
PD#SWPL-6028
Problem:
add ftrace-size
Solution:
add ftrace-size
Verify:
x301
Change-Id: I3b39deda025bde506c32ca8741876083d89038f7
Signed-off-by: Sandy Luo <sandy.luo@amlogic.com>
qiyao.zhou [Wed, 22 May 2019 11:23:10 +0000 (19:23 +0800)]
vpp: Modify vframe epoll event [1/1]
PD#SWPL-8850
Problem:
too many print when channel change.
Solution:
Modify vframe epoll event flow to avoid same event.
Verify:
verify on marconi.
Change-Id: Iefbd190c0280276bf941c48bf99706a0f2573df1
Signed-off-by: qiyao.zhou <qiyao.zhou@amlogic.com>
Evoke Zhang [Fri, 17 May 2019 06:56:15 +0000 (14:56 +0800)]
tvafe: vbi: protect vbi data byte [1/1]
PD#SWPL-8002
Problem:
some special atv cause vbi crash
Solution:
add vbi data byte protection
Verify:
x301
Change-Id: Ie890925260dc250003d375b4d1cdf3d51afe732e
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
Evoke Zhang [Tue, 21 May 2019 09:23:57 +0000 (17:23 +0800)]
vdin: add dolby mem release protection [1/1]
PD#SWPL-8797
Problem:
sometime oops occurred for vdin_dolby mem release
Solution:
add vdin dolby mem alloc flag & release protection
Verify:
x301
Change-Id: Iee90b58a0624c32032e204adcd043c8e94d03f1f
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
qiyao.zhou [Wed, 22 May 2019 07:43:15 +0000 (15:43 +0800)]
vpp: Modify vframe epoll event [1/1]
PD#SWPL-8850
Problem:
too many print when channel change.
Solution:
Modify vframe epoll event flow to avoid same event.
Verify:
verify on marconi.
Change-Id: Id709439f24d3cad82df6082c477cacce1a9b9cc7
Signed-off-by: qiyao.zhou <qiyao.zhou@amlogic.com>
Wenfeng Guo [Thu, 9 May 2019 03:04:08 +0000 (11:04 +0800)]
di: fix wire drawing issue caused by pendulum clock stuck [1/1]
PD#SWPL-7650
Problem:
TL1 have drawing.
Solution:
fine-tuning GMV
Verify:
TL1
Change-Id: Ie50207969a2d7511882552b0adc8baef083300ff
Signed-off-by: Wenfeng Guo <wenfeng.guo@amlogic.com>
Yong Qin [Mon, 20 May 2019 02:02:25 +0000 (10:02 +0800)]
vlock: for phase lock sometime can't lock [1/1]
PD#SWPL-6403
Problem:
vlock phase lock time is not accurate as theoretical value
Solution:
1.change the limite
2.increace the frq and phase lock window
3.lone time unlock, need retry
Verify:
tl1
Change-Id: I67e56e59f53848128e65a54c6a8acf750a03b72d
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
Evoke Zhang [Thu, 25 Apr 2019 02:39:13 +0000 (10:39 +0800)]
lcd: support custom vx1 hw filter [1/1]
PD#SWPL-8785
Problem:
fixed vx1 hw filter maybe cause some panel display normal
Solution:
add custom vx1 hw filter support
for panel ini:
if_attr_8=0x1 #vx1 hw filter period(0=default setting)
if_attr_9=0x0 #vx1 hw filter cnt(0=default setting)
for dts:
hw_filter = <0x1 0x0>; /* period(0=default), cnt(0=default) */
Verify:
x301
Change-Id: I4ce5f8fe4294331d6ec0026fa7736c6d3397c05e
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
ruixuan.li [Tue, 2 Apr 2019 12:37:38 +0000 (20:37 +0800)]
tm2: emmc run hs400 200M [1/1]
PD#SWPL-5658
Problem:
emmc run hs200 200M now
Solution:
set emmc busmode to hs400 200M
Verify:
passed on t962e2 ab311
Change-Id: If5fef5c3b55cc95152b0d5d19bb5a56b293aafcf
Signed-off-by: ruixuan.li <ruixuan.li@amlogic.com>
Signed-off-by: Ruixuan Li <ruixuan.li@amlogic.com>
Long Yu [Tue, 14 May 2019 07:17:30 +0000 (15:17 +0800)]
emmc: report response crc error on G12B when hs400 200M busmode [1/1]
PD#SWPL-8670
Problem:
G12B report response crc error when hs400 200M busmode
Solution:
find a eyetest hole between 14-20 or 48-54, otherwise
tuning tx_delay and find again and
adjust CMD rx timing dynamically in HS400 mode
Verify:
passed on G12B
Change-Id: I23e4d5118e0ca0564367a77102aea9e1085633a9
Signed-off-by: Long Yu <long.yu@amlogic.com>
yao liu [Wed, 8 May 2019 13:55:45 +0000 (21:55 +0800)]
dolby: set dovi gmax/pmax [1/1]
PD#SWPL-8159
Problem:
Default graphics is always 100nit,
need to set different nits for SDR/HDR/DV TV
Solution:
dolby_vision_target_graphics_max[] for DV/HDR/SDR;
dolby_vision_target_max[][] for video_max;
module param dolby_vision_target_max for force graphics max
when set it to non-zero;
Verify:
verified on sm1
Change-Id: If6f5ae4ffb37629b51d21764302689da776e9f7f
Signed-off-by: yao liu <yao.liu@amlogic.com>
renjiang.han [Mon, 20 May 2019 08:30:59 +0000 (16:30 +0800)]
ppmgr: 4k video does not do tb detection. [1/1]
PD#SWPL-8338
Problem:
video of 4k playback caton.
Solution:
4k video does not do tb detection.
Verify:
on x301
Change-Id: Idf10ca33e7ba2d26d759c6e5c21bc465cad0992e
Signed-off-by: renjiang.han <renjiang.han@amlogic.com>
nengwen.chen [Mon, 20 May 2019 05:39:13 +0000 (13:39 +0800)]
atv_demod: fix BG/DK sound output power [1/1]
PD#TV-6012
Problem:
fix BG/DK sound output power.
Solution:
1.fix BG/DK sound output power.
Verify:
Verified by x301
Change-Id: I428d8a1ed97c8da5fdfe55f8dd7ac2fda9200814
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
Yue Wang [Thu, 16 May 2019 09:21:37 +0000 (17:21 +0800)]
pcie: code optimization [1/1]
PD#SWPL-8664
Problem:
pcie driver code optimization.
Solution:
pcie driver code optimization.
Verify:
T962E2
Change-Id: Ie157ad14a7a3b347bfb333e75432863d3e988dec
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
Tao Zeng [Tue, 14 May 2019 10:18:09 +0000 (18:18 +0800)]
secmon: clear mmu mapping of cma before a73 run [1/1]
PD#SWPL-8082
Problem:
Very low ratio(0.3%) of SError can be seen when do auto-reboot
test on g12b platfrom.
Solution:
Clear mmu mapping of secmon cma before a73 run
Verify:
w400
Change-Id: Idacfaea29dea2eff86304c7071a560c76654a5c3
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
Nanxin Qin [Thu, 20 Sep 2018 17:18:20 +0000 (01:18 +0800)]
media: fixed some issues for the v4l2 decode. [2/2]
PD#SWPL-5314
Problem:
1. add a dummy vframe flag VFRAME_FLAG_EMPTY_FRAME_V4L.
2. add the FRAME_BASE_PATH_V4L_* for v4l2 display
3. recycle vframes when the isr recevie the empty vframe.
Solution:
1. fixed some issues for the v4l2 decode.
2. add pause and resume for v4l2 m2m job.
Verify:
todo
Change-Id: I00b44ad4d3a75f7e2167ca347562d002c2690430
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
Jian Hu [Mon, 20 May 2019 06:46:03 +0000 (14:46 +0800)]
clk: tm2: fix tm2 64bit hangup [1/1]
PD#SWPL-8546
Problem:
it hangup in tm2 64bit
Solution:
call clk_set_parent to set
tl1_dsu_fixed_source_sel1 to 1G
Verify:
verified on tm2 ab311
Change-Id: I2e75c76aab3ba2510050592ea5f6c3069cfa9f4d
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Yinming Ding [Tue, 23 Apr 2019 12:15:49 +0000 (20:15 +0800)]
avsync: tsync: reply the stream without audio after loop play [1/1]
PD#SWPL-7379
Problem:
Decoding stream with no audio pid freezes video
Solution:
Reply the stream with no audio after loop play
Verify:
Verified by R314
Change-Id: I8782271fbf40398c639346c960f0e61911ffc1ee
Signed-off-by: Yinming Ding <yinming.ding@amlogic.com>
Hanjie Lin [Thu, 16 May 2019 05:38:20 +0000 (13:38 +0800)]
mm: arm: fix unmatched pte_offset_map/pte_unmap error [1/1]
PD#TV-5777
Problem:
[CVTE][T972][9.0][System]: PT190004-1300: Appear auto reboot exception
during downloading Facebook app.
get_user_pfn() may caused unmatched pte_offset_map/pte_unmap call, then
may cause bad task preempt_count and subsequently panic.
Solution:
add matched pte_offset_map/pte_unmap
Verify:
tl1
Change-Id: I98240b443b8a0fae89d0ee93701eb1bfdce51b82
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
Zhe Wang [Mon, 13 May 2019 06:56:25 +0000 (14:56 +0800)]
audio: add i2s and spdif fine clk tuning interface [1/1]
PD#SWPL-8310
Problem:
DTV, a/v is out of sync
Solution:
add i2s and spdif fine clk tuning interface
Verify:
verify on R311.
Change-Id: I8219774bd5fe334fa21227d427ce4dbb06177dc8
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
Brian Zhu [Thu, 16 May 2019 13:13:56 +0000 (21:13 +0800)]
dv: reset the g_vpotch value according to current vinfo [1/1]
PD#SWPL-8419
Problem:
Get the wrong g_vpotch value when platform bootup
Solution:
reset the g_vpotch value according to current vinfo
Verify:
verified by u212
Change-Id: I063140f0a19cf349cd8e6d66c571ae5b2c7e3de7
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
MingLiang Dong [Mon, 29 Apr 2019 09:12:59 +0000 (05:12 -0400)]
amvecm: optimize lc size config [1/1]
PD#TV-4687
Problem:
Set the screen mode of HDMI channel to 4:3 and
restart to enter HDMI again. The screen displays abnormal
Solution:
optimize lc size config
Verify:
verify on TL1
Change-Id: I320f7476e09d900635767190748a4fbb486b5f6f
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
nengwen.chen [Fri, 17 May 2019 07:08:00 +0000 (15:08 +0800)]
atv_demod: fix atbm2040 tuner channel scanning [1/1]
PD#TV-5499
Problem:
fix atbm2040 tuner channel scanning.
Solution:
1.fix atbm2040 tuner channel scanning.
2.modify tune interface.
Verify:
Verified by x301
Change-Id: Id135bcdca797ab93e8a2902476157b2ce324a2ce
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
yujie.wu [Thu, 11 Apr 2019 02:38:54 +0000 (10:38 +0800)]
audio: fix spdif not work on soundbar [1/1]
PD#SWPL-6801
Problem:
There is too much kernel print which
blocks the system
Solution:
Add condition to remove the print log
Verify:
A113
Change-Id: I5762893b424e8201e2725f33854473097f1246b9
Signed-off-by: yujie.wu <yujie.wu@amlogic.com>
Shunzhou Jiang [Mon, 13 May 2019 08:45:33 +0000 (16:45 +0800)]
dts: tm2: enable dsp mailbox driver [1/1]
PD#SWPL-6580
Problem:
dsp mailbox driver not enabled
Solution:
enable dsp mbox driver
Verify:
tm2
Change-Id: I926c6da3fd373bd19cc171514096e90d929a5807
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
shaochan.liu [Mon, 13 May 2019 10:14:24 +0000 (18:14 +0800)]
lcd: support lcd pll retry when lock failed [2/2]
PD#SWPL-7869
Problem:
need support lcd pll retry when lock failed
Solution:
add support lcd pll retry when lock failed
Verify:
t962x2-x301
Change-Id: Ia74926713f46c7e1fc2831c9ee788c5fc980ba37
Signed-off-by: shaochan.liu <shaochan.liu@amlogic.com>
Jianxin Pan [Mon, 20 May 2019 02:15:14 +0000 (19:15 -0700)]
Merge "lcd: add lcd_ctrl bootargs for lcd driver control [2/2]" into amlogic-4.9-dev
Evoke Zhang [Fri, 17 May 2019 09:09:22 +0000 (17:09 +0800)]
tvafe: update parameters for AV NTSC [1/1]
PD#SWPL-7283
Problem:
display is not good
Solution:
modify cvd2 0xb0, 0xb1 reg value
Verify:
x301
Change-Id: Ib512258336d3a6bb14c4eda04488fbaf60e38af0
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
Yong Qin [Tue, 14 May 2019 01:43:55 +0000 (09:43 +0800)]
vdin: horizontal floral stripe [1/1]
PD#SWPL-7391
Problem:
when hdmi 4k, tv menu set game mode, some time have
floral stripe
Solution:
afbc write addr is same at read addr, will occur.
Verify:
tl1
Change-Id: Iac10768116dea0d3bc4175871b954d56b044f390
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
Tao Zeng [Thu, 16 May 2019 09:28:29 +0000 (17:28 +0800)]
kasan: change address layout [3/3]
PD#SWPL-8572
Problem:
In change http://scgit.amlogic.com:8080/#/c/73995/ we have changed
memory layout of vmalloc. Which caused kasan can't be used
Solution:
change kasan address layout
Verify:
x301
Change-Id: I28aee4b1d9b622dd884e6c2d6b621aa870cd8586
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
Tao Zeng [Thu, 16 May 2019 09:27:30 +0000 (17:27 +0800)]
vmalloc: restore 240mb memory space [2/3]
PD#SWPL-8572
Problem:
To avoid vmalloc address space not enough caused by binder, in
following change we have increased 128mb vmalloc address space:
http://scgit.amlogic.com:8080/#/c/72977/
Solution:
Since we have back porting binder optimize from kernel 4.19 in
change:
http://scgit.amlogic.com:8080/#/c/73975/
So we can restore 240mb memory space for vmalloc
Verify:
x301
Change-Id: If16e83eadb9ab40bb7e0e2ca168dc604420cdac7
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
Tao Zeng [Tue, 14 May 2019 08:35:57 +0000 (16:35 +0800)]
binder: back port changes from kernel 4.19 [1/3]
PD#SWPL-8572
Problems:
based on android platfrom, each process may allocate 1MB vmalloc
memory space for IPC. But most process don't use full memory
range of vmalloc space. It's a waste of memory space and may
cause driver can't work normal based on 32bit kernel
Soluton:
On kernel 4.19, google have fixed it, so we need back porting
following changes:
Squashed commit of the following:
commit
b12a56e5342e15e99b0fb07c67dfce0891ba2f6b
Author: Todd Kjos <tkjos@google.com>
Date: Tue Mar 19 09:53:01 2019 -0700
FROMGIT: binder: fix BUG_ON found by selinux-testsuite
The selinux-testsuite found an issue resulting in a BUG_ON()
where a conditional relied on a size_t going negative when
checking the validity of a buffer offset.
(cherry picked from commit
5997da82145bb7c9a56d834894cb81f81f219344
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
char-misc-linus)
Bug:
67668716
Change-Id: Ib3b408717141deadddcb6b95ad98c0b97d9d98ea
Fixes:
7a67a39320df ("binder: add function to copy binder object from buffer")
Reported-by: Paul Moore <paul@paul-moore.com>
Tested-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Todd Kjos <tkjos@google.com>
commit
5b28e504d93a5f1efc074dd7cdcadc07293bb783
Author: Todd Kjos <tkjos@android.com>
Date: Thu Feb 14 15:22:57 2019 -0800
UPSTREAM: binder: fix handling of misaligned binder object
Fixes crash found by syzbot:
kernel BUG at drivers/android/binder_alloc.c:LINE! (2)
(cherry pick from commit
26528be6720bb40bc8844e97ee73a37e530e9c5e)
Bug:
67668716
Reported-and-tested-by: syzbot+55de1eb4975dec156d8f@syzkaller.appspotmail.com
Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: Ib8597dd05a158f78503d4affe6c5f46ded16a811
commit
e110c3b44e437bad09f76c2b42f23dcad898f57d
Author: Todd Kjos <tkjos@android.com>
Date: Wed Feb 13 11:48:53 2019 -0800
UPSTREAM: binder: fix sparse issue in binder_alloc_selftest.c
Fixes sparse issues reported by the kbuild test robot running
on https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
char-misc-testing:
bde4a19fc04f5 ("binder: use userspace pointer as base
of buffer space")
Error output (drivers/android/binder_alloc_selftest.c):
sparse: warning: incorrect type in assignment (different address spaces)
sparse: expected void *page_addr
sparse: got void [noderef] <asn:1> *user_data
sparse: error: subtraction of different types can't work
Fixed by adding necessary "__user" tags.
(cherry pick from commit
36f30937922ce75390c73f99e650e4f2eb56b0e6)
Bug:
67668716
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: Ia0a16d163251381d4bc04f46a44dddbc18b10a85
commit
9f6fd7733286f1af04d153c9d3a050ca2615b3cc
Author: Todd Kjos <tkjos@android.com>
Date: Fri Feb 8 10:35:20 2019 -0800
BACKPORT: binder: use userspace pointer as base of buffer space
Now that alloc->buffer points to the userspace vm_area
rename buffer->data to buffer->user_data and rename
local pointers that hold user addresses. Also use the
"__user" tag to annotate all user pointers so sparse
can flag cases where user pointer vaues are copied to
kernel pointers. Refactor code to use offsets instead
of user pointers.
(cherry pick from commit
bde4a19fc04f5f46298c86b1acb7a4af1d5f138d)
Bug:
67668716
Change-Id: I9d04b844c5994d1f6214da795799e6b373bc9816
Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit
194d8606b011657ce30bf0c240a5adcad0691201
Author: Todd Kjos <tkjos@android.com>
Date: Wed Dec 5 15:19:25 2018 -0800
UPSTREAM: binder: fix kerneldoc header for struct binder_buffer
Fix the incomplete kerneldoc header for struct binder_buffer.
(cherry pick from commit
7a2670a5bc917e4e7c9be5274efc004f9bd1216a)
Bug:
67668716
Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: I6bb942e6a9466b02653349943524462f205af839
commit
55cb58623a60d48678d8eb74e1cabe7744ed62c2
Author: Todd Kjos <tkjos@android.com>
Date: Fri Feb 8 10:35:19 2019 -0800
BACKPORT: binder: remove user_buffer_offset
Remove user_buffer_offset since there is no kernel
buffer pointer anymore.
(cherry pick from commit
c41358a5f5217abd7c051e8d42397e5b80f3b3ed)
Bug:
67668716
Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: I399219867704dc5013453a7738193c742fc970ad
commit
3301f77efa9d99e742e5642243b891e014becf17
Author: Todd Kjos <tkjos@android.com>
Date: Fri Feb 8 10:35:18 2019 -0800
UPSTREAM: binder: remove kernel vm_area for buffer space
Remove the kernel's vm_area and the code that maps
buffer pages into it.
(cherry pick from commit
880211667b203dd32724f3be224c44c0400aa0a6)
Bug:
67668716
Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: I2595bb8416c2bbfcf97ad3d7380ae94e29c209fb
commit
628c27a60665f15984364f6c0a1bda03473b3a78
Author: Todd Kjos <tkjos@android.com>
Date: Fri Feb 8 10:35:17 2019 -0800
UPSTREAM: binder: avoid kernel vm_area for buffer fixups
Refactor the functions to validate and fixup struct
binder_buffer pointer objects to avoid using vm_area
pointers. Instead copy to/from kernel space using
binder_alloc_copy_to_buffer() and
binder_alloc_copy_from_buffer(). The following
functions were refactored:
refactor binder_validate_ptr()
binder_validate_fixup()
binder_fixup_parent()
(cherry pick from commit
db6b0b810bf945d1991917ffce0e93383101f2fa)
Bug:
67668716
Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: Ic222af9b6c56bf48fd0b65debe981d19a7809e77
commit
ed39057090cc4a95c318bafcd97f418da56e3867
Author: Todd Kjos <tkjos@android.com>
Date: Fri Feb 8 10:35:16 2019 -0800
BACKPORT: binder: add function to copy binder object from buffer
When creating or tearing down a transaction, the binder driver
examines objects in the buffer and takes appropriate action.
To do this without needing to dereference pointers into the
buffer, the local copies of the objects are needed. This patch
introduces a function to validate and copy binder objects
from the buffer to a local structure.
(cherry pick from commit
7a67a39320dfba4b36d3be5dae4581194e650316)
Bug:
67668716
Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: I42dfe238a2d20bdeff479068ca87a80e4577e64a
commit
01f8f48c56b53faf1c795112f451a032a0d00b75
Author: Todd Kjos <tkjos@android.com>
Date: Fri Feb 8 10:35:15 2019 -0800
BACKPORT: binder: add functions to copy to/from binder buffers
Avoid vm_area when copying to or from binder buffers.
Instead, new copy functions are added that copy from
kernel space to binder buffer space. These use
kmap_atomic() and kunmap_atomic() to create temporary
mappings and then memcpy() is used to copy within
that page.
Also, kmap_atomic() / kunmap_atomic() use the appropriate
cache flushing to support VIVT cache architectures.
Allow binder to build if CPU_CACHE_VIVT is defined.
Several uses of the new functions are added here. More
to follow in subsequent patches.
(cherry picked from commit
8ced0c6231ead26eca8cb416dcb7cc1c2cdd41d8)
Bug:
67668716
Change-Id: I6a93d2396d0a80c352a1d563fc7fb523a753e38c
Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit
bfc28d4c046d2a1aea5db66508e7fbb65a31a4a9
Author: Todd Kjos <tkjos@android.com>
Date: Fri Feb 8 10:35:14 2019 -0800
UPSTREAM: binder: create userspace-to-binder-buffer copy function
The binder driver uses a vm_area to map the per-process
binder buffer space. For 32-bit android devices, this is
now taking too much vmalloc space. This patch removes
the use of vm_area when copying the transaction data
from the sender to the buffer space. Instead of using
copy_from_user() for multi-page copies, it now uses
binder_alloc_copy_user_to_buffer() which uses kmap()
and kunmap() to map each page, and uses copy_from_user()
for copying to that page.
(cherry picked from
1a7c3d9bb7a926e88d5f57643e75ad1abfc55013)
Bug:
67668716
Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: I59ff83455984fce4626476e30601ed8b99858a92
commit
89a1a65d35200d8ca94c865f061f11af41a8ced7
Author: Todd Kjos <tkjos@android.com>
Date: Mon Jan 14 09:10:21 2019 -0800
FROMGIT: binder: create node flag to request sender's security context
To allow servers to verify client identity, allow a node
flag to be set that causes the sender's security context
to be delivered with the transaction. The BR_TRANSACTION
command is extended in BR_TRANSACTION_SEC_CTX to
contain a pointer to the security context string.
Signed-off-by: Todd Kjos <tkjos@google.com>
Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
ec74136ded792deed80780a2f8baf3521eeb72f9
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
master)
Change-Id: I44496546e2d0dc0022f818a45cd52feb1c1a92cb
Signed-off-by: Todd Kjos <tkjos@google.com>
commit
4afd6d2498ecd54e4211c6e47d8956a686a52ee3
Author: Todd Kjos <tkjos@android.com>
Date: Wed Dec 5 15:19:26 2018 -0800
UPSTREAM: binder: filter out nodes when showing binder procs
When dumping out binder transactions via a debug node,
the output is too verbose if a process has many nodes.
Change the output for transaction dumps to only display
nodes with pending async transactions.
Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
ecd589d8f5661dd3a9545079a29b678cd9e3ecf3)
Bug:
112037142
Change-Id: Iaa76ebdc844037ce1ee3bf2e590676790a959cef
commit
72e3c1d60a499bfa547d962a150082f47bfb16af
Author: Todd Kjos <tkjos@android.com>
Date: Tue Nov 6 15:55:32 2018 -0800
binder: fix race that allows malicious free of live buffer
commit
7bada55ab50697861eee6bb7d60b41e68a961a9c upstream.
Malicious code can attempt to free buffers using the BC_FREE_BUFFER
ioctl to binder. There are protections against a user freeing a buffer
while in use by the kernel, however there was a window where
BC_FREE_BUFFER could be used to free a recently allocated buffer that
was not completely initialized. This resulted in a use-after-free
detected by KASAN with a malicious test program.
This window is closed by setting the buffer's allow_user_free attribute
to 0 when the buffer is allocated or when the user has previously freed
it instead of waiting for the caller to set it. The problem was that
when the struct buffer was recycled, allow_user_free was stale and set
to 1 allowing a free to go through.
Signed-off-by: Todd Kjos <tkjos@google.com>
Acked-by: Arve Hjønnevåg <arve@android.com>
Cc: stable <stable@vger.kernel.org> # 4.14
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit
c7940ee7e55f4caec80ab646b7f9d495ee2677c6
Author: Martijn Coenen <maco@android.com>
Date: Sat Aug 25 13:50:56 2018 -0700
UPSTREAM: binder: Add BINDER_GET_NODE_INFO_FOR_REF ioctl.
This allows the context manager to retrieve information about nodes
that it holds a reference to, such as the current number of
references to those nodes.
Such information can for example be used to determine whether the
servicemanager is the only process holding a reference to a node.
This information can then be passed on to the process holding the
node, which can in turn decide whether it wants to shut down to
reduce resource usage.
Bug:
79983843
Change-Id: I21e52ed1ca2137f7bfdc0300365fb1285b7e3d70
Signed-off-by: Martijn Coenen <maco@android.com>
commit
afd02b5ead68a94eb6bf1bf5234271687d7eb461
Author: Minchan Kim <minchan@kernel.org>
Date: Thu Aug 23 14:29:56 2018 +0900
android: binder: fix the race mmap and alloc_new_buf_locked
There is RaceFuzzer report like below because we have no lock to close
below the race between binder_mmap and binder_alloc_new_buf_locked.
To close the race, let's use memory barrier so that if someone see
alloc->vma is not NULL, alloc->vma_vm_mm should be never NULL.
(I didn't add stable mark intentionallybecause standard android
userspace libraries that interact with binder (libbinder & libhwbinder)
prevent the mmap/ioctl race. - from Todd)
"
Thread interleaving:
CPU0 (binder_alloc_mmap_handler) CPU1 (binder_alloc_new_buf_locked)
===== =====
// drivers/android/binder_alloc.c
// #L718 (v4.18-rc3)
alloc->vma = vma;
// drivers/android/binder_alloc.c
// #L346 (v4.18-rc3)
if (alloc->vma == NULL) {
...
// alloc->vma is not NULL at this point
return ERR_PTR(-ESRCH);
}
...
// #L438
binder_update_page_range(alloc, 0,
(void *)PAGE_ALIGN((uintptr_t)buffer->data),
end_page_addr);
// In binder_update_page_range() #L218
// But still alloc->vma_vm_mm is NULL here
if (need_mm && mmget_not_zero(alloc->vma_vm_mm))
alloc->vma_vm_mm = vma->vm_mm;
Crash Log:
==================================================================
BUG: KASAN: null-ptr-deref in __atomic_add_unless include/asm-generic/atomic-instrumented.h:89 [inline]
BUG: KASAN: null-ptr-deref in atomic_add_unless include/linux/atomic.h:533 [inline]
BUG: KASAN: null-ptr-deref in mmget_not_zero include/linux/sched/mm.h:75 [inline]
BUG: KASAN: null-ptr-deref in binder_update_page_range+0xece/0x18e0 drivers/android/binder_alloc.c:218
Write of size 4 at addr
0000000000000058 by task syz-executor0/11184
CPU: 1 PID: 11184 Comm: syz-executor0 Not tainted 4.18.0-rc3 #1
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.8.2-0-g33fbe13 by qemu-project.org 04/01/2014
Call Trace:
__dump_stack lib/dump_stack.c:77 [inline]
dump_stack+0x16e/0x22c lib/dump_stack.c:113
kasan_report_error mm/kasan/report.c:352 [inline]
kasan_report+0x163/0x380 mm/kasan/report.c:412
check_memory_region_inline mm/kasan/kasan.c:260 [inline]
check_memory_region+0x140/0x1a0 mm/kasan/kasan.c:267
kasan_check_write+0x14/0x20 mm/kasan/kasan.c:278
__atomic_add_unless include/asm-generic/atomic-instrumented.h:89 [inline]
atomic_add_unless include/linux/atomic.h:533 [inline]
mmget_not_zero include/linux/sched/mm.h:75 [inline]
binder_update_page_range+0xece/0x18e0 drivers/android/binder_alloc.c:218
binder_alloc_new_buf_locked drivers/android/binder_alloc.c:443 [inline]
binder_alloc_new_buf+0x467/0xc30 drivers/android/binder_alloc.c:513
binder_transaction+0x125b/0x4fb0 drivers/android/binder.c:2957
binder_thread_write+0xc08/0x2770 drivers/android/binder.c:3528
binder_ioctl_write_read.isra.39+0x24f/0x8e0 drivers/android/binder.c:4456
binder_ioctl+0xa86/0xf34 drivers/android/binder.c:4596
vfs_ioctl fs/ioctl.c:46 [inline]
do_vfs_ioctl+0x154/0xd40 fs/ioctl.c:686
ksys_ioctl+0x94/0xb0 fs/ioctl.c:701
__do_sys_ioctl fs/ioctl.c:708 [inline]
__se_sys_ioctl fs/ioctl.c:706 [inline]
__x64_sys_ioctl+0x43/0x50 fs/ioctl.c:706
do_syscall_64+0x167/0x4b0 arch/x86/entry/common.c:290
entry_SYSCALL_64_after_hwframe+0x49/0xbe
"
Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Minchan Kim <minchan@kernel.org>
Reviewed-by: Martijn Coenen <maco@android.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit
3ed5fd0f095e9d6fe5f33f909165a8cd596e8b46
Author: Sherry Yang <sherryy@android.com>
Date: Tue Aug 7 12:57:13 2018 -0700
android: binder: Rate-limit debug and userspace triggered err msgs
Use rate-limited debug messages where userspace can trigger
excessive log spams.
Acked-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Sherry Yang <sherryy@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit
8129fb3ee7af23a888383aa23647c9d576ecdfef
Author: Sherry Yang <sherryy@android.com>
Date: Thu Jul 26 17:17:17 2018 -0700
android: binder: Show extra_buffers_size in trace
Add extra_buffers_size to the binder_transaction_alloc_buf tracepoint.
Acked-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Sherry Yang <sherryy@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit
3b0bbcb65457ddec6fbee72bb26002e2bba16089
Author: Guenter Roeck <linux@roeck-us.net>
Date: Mon Jul 23 14:41:38 2018 -0700
android: binder: Include asm/cacheflush.h after linux/ include files
If asm/cacheflush.h is included first, the following build warnings are
seen with sparc32 builds.
In file included from arch/sparc/include/asm/cacheflush.h:11:0,
from drivers/android/binder.c:54:
arch/sparc/include/asm/cacheflush_32.h:40:37: warning:
'struct page' declared inside parameter list will not be visible
outside of this definition or declaration
Moving the asm/ include after linux/ includes solves the problem.
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit
e8a4948f49629c6ab122339f46908884d55ca7e9
Author: Guenter Roeck <linux@roeck-us.net>
Date: Mon Jul 23 14:47:23 2018 -0700
android: binder_alloc: Include asm/cacheflush.h after linux/ include files
If asm/cacheflush.h is included first, the following build warnings are
seen with sparc32 builds.
In file included from ./arch/sparc/include/asm/cacheflush.h:11:0,
from drivers/android/binder_alloc.c:20:
./arch/sparc/include/asm/cacheflush_32.h:40:37: warning:
'struct page' declared inside parameter list
Moving the asm/ include after linux/ includes fixes the problem.
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit
8cae6730ef318700ab3a0db3ef43ee6a5e5856c8
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Wed Jun 6 14:40:56 2018 +0200
android: binder: Drop dependency on !M68K
As of commit
7124330dabe5b3cb ("m68k/uaccess: Revive 64-bit
get_user()"), the 64-bit Android binder interface builds fine on m68k.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
verify:
p212
Change-Id: I1bac2c5345bcac64a3890f1688c1ecc4a3654a79
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
Liang Yang [Wed, 15 May 2019 09:01:48 +0000 (17:01 +0800)]
nand: adjust nand info page for ddr parameter function [1/1]
PD#SWPL-7804
Problem:
OTA upgrade would fail because nand info page no consisent
Solution:
Keep nand info page consisent between bl2/bl33/kernel
Verify:
s420
Change-Id: Icef5f720ba80e5f639b4ee7d1f1201833d5a5656
Signed-off-by: Liang Yang <liang.yang@amlogic.com>
sky zhou [Sat, 6 Apr 2019 11:35:34 +0000 (19:35 +0800)]
osd: fix release dma buf error when vout1&2 run at same time.
PD #SWPL-6027
Problem:
dmabuf panic when vout1,vout2 run at same time.
Solution:
When do pandisplay, only release the dma buf displayed
on current vout pipeline.
Verify:
Verify on macroni.
Change-Id: I8951d55f9f56cbfa509bcbe2906a108c5f50dbfe
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
Yue Wang [Sun, 5 May 2019 05:34:00 +0000 (13:34 +0800)]
usb: add USB + PCIE feature [1/1]
PD#SWPL-8058
Problem:
usb + pcie.
Solution:
add usb + pcie feature.
Verify:
TM2
Change-Id: Ib5838cb0093753d346e46ce0fa6007c0edf511c2
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
renjiang.han [Thu, 16 May 2019 08:34:31 +0000 (16:34 +0800)]
ppmgr: Add IS_ERR_OR_NULL to determine if the thread exists [1/1]
PD#SWPL-8658
Problem:
handle is NULL cause kernel panic.
Solution:
Add IS_ERR_OR_NULL to prevent hanle from being NULL
to cause kernel panic.
Verify:
on T962X2
Change-Id: I3086a497d99646e6475a93b5a53b3c9aca2d2ada
Signed-off-by: renjiang.han <renjiang.han@amlogic.com>
zhiwei.yuan [Tue, 14 May 2019 10:39:10 +0000 (18:39 +0800)]
vdin: cvbs video is not smooth after playing a period of time [1/1]
PD#SWPL-8565
Problem:
unknown buf be taken by vpp sometimes
Solution:
fix skip mechanism, reduce numeber of unknown buf
Verify:
verified by t962x2_x301
Change-Id: I296d9f2f5c25a37ec32b458ecb23d64ca8c321a7
Signed-off-by: zhiwei.yuan <zhiwei.yuan@amlogic.com>
Shuai Li [Wed, 8 May 2019 09:37:37 +0000 (17:37 +0800)]
audio: config 2+2 loopback [1/1]
PD#SWPL-7741
Problem:
Default is 6+2.
But aec needs 2+2 setting.
Solution:
Change the dts setting.
Verify:
SM1 AC213.
Change-Id: I5b3585c017146bde5b265f315f8167e8232566fb
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
Shuai Li [Fri, 10 May 2019 05:51:43 +0000 (13:51 +0800)]
audio: support 48k out & 16k loopback [1/1]
PD#SWPL-7741
Problem:
Enable the loopback function.
Fix 48k output & 16k loopback abnormal.
Solution:
Fix the resample source.
DO not touch output clk at loopback driver.
Verify:
Sm1, AC213
Change-Id: I210083813e9e6ec834941da333f8ce076e9afbcf
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
Zhe Wang [Thu, 16 May 2019 12:53:46 +0000 (20:53 +0800)]
audio: fixed audio clk source sel error [1/1]
PD#SWPL-8663
Problem:
there is no audio clk on SM1
Solution:
fixed clk source setting error
Verify:
AC200
Change-Id: Ief01d680c435cfc2f50f9b7da0a6e4d68db846d5
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
Blance Tang [Wed, 15 May 2019 03:11:44 +0000 (11:11 +0800)]
buildroot: Add SM1 AC200/AC213 buildroot dts files [1/1]
PD#SWPL-6202
Problem:
Missing SM1 AC200/AC213 buildroot dts files
Solution:
Add SM1 AC200/AC213 buildroot dts files
Verify:
Local
Change-Id: I99c2e7543432e18496f77b5dcbed428823934691
Signed-off-by: Blance Tang <guofeng.tang@amlogic.com>
Jian Hu [Thu, 16 May 2019 11:11:19 +0000 (19:11 +0800)]
clk: tl1: fix stack overflow when set rate for dsu clock [1/1]
PD#SWPL-8546
Problem:
stack overflow
Solution:
remove clk_set_rate in dsu clock notifier
Verify:
tl1 X301
Change-Id: Ie4b2fe929446ade505c714d11c1474146d188ac2
Signed-off-by: Sandy Luo <sandy.luo@amlogic.com>
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Shuyu Li [Wed, 27 Mar 2019 12:55:05 +0000 (20:55 +0800)]
audio: hifi4dsp: Add tm2 hifi 4 dsp ctl driver support [1/1]
PD#SWPL-7574
Problem:
Add hifi 4 dsp ctl driver support on tm2
Solution:
Add hifi 4 dsp ctl driver support on tm2
Verify:
Verified on T962E2_ab311 board
Change-Id: Ifd07ec8b8e1c3aeaa1a446a2a0eb9c00618e4ba5
Signed-off-by: Shuyu Li <shuyu.li@amlogic.com>
Zongdong Jiao [Mon, 29 Apr 2019 07:16:21 +0000 (15:16 +0800)]
hdmirp: enable CEC physical address passing for non-repeater mode [1/4]
PD#SWPL-6988
Problem:
Lack CEC physical address passing
Solution:
Pass CEC address from Tx to Rx in kernel
Verify:
T962X3
Change-Id: I67952d040478c0068e3f0ed777ecf40410a7767d
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
Signed-off-by: Lei Yang <lei.yang@amlogic.com>
keke.li [Tue, 19 Mar 2019 05:46:35 +0000 (13:46 +0800)]
dts: add arm isp device node [1/1]
PD#SWPL-70
Problem:
arm isp driver need to use dts
Solution:
add arm isp device node
Verify:
w400
Test: camera preview and capture OK
Change-Id: Idc603890f07afe25beba5deab3ab391825aee584
Signed-off-by: Keke Li <keke.li@amlogic.com>
yicheng shen [Thu, 9 May 2019 13:10:33 +0000 (21:10 +0800)]
hdmirx: add hdcp2.2 test key detection [1/3]
PD#SWPL-8312
Problem:
hdmi can not detect the hdcp2.2 aml_test_key;
Solution:
Add aml_test_key detection function;
Verify:
TL1: kernel 4.9 TXLX: kernel 3.14
Change-Id: I126e6f94f8b9f8479619b3cfddf22306e8c8ac15
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
jintao xu [Fri, 10 May 2019 11:47:36 +0000 (19:47 +0800)]
pipvideo: add frame drop mechanism [1/1]
PD#OTT-3616
Problem:
when HDMI output is 30HZ, video is 60fps, pipvideo only can display 30fps,
need drop 30fps.
Solution:
drop frames when there is no time to display
Verify:
U212
Change-Id: I3c946aa49ccc40b8e69e6e7c5031df0b5af34454
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
jintao xu [Sun, 5 May 2019 11:37:14 +0000 (19:37 +0800)]
amlvideo: fix panic when unreg [1/1]
PD#OTT-3420
Problem:
panic when vfm unreg.
Solution:
Add mutex in dequeue and unreg
Verify:
U212
Change-Id: I902085aed670fefb519d07ffcc3e896ec0c404dd
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
Rui Wang [Tue, 14 May 2019 05:22:58 +0000 (13:22 +0800)]
video: enable pts calculation when hold video state changes [1/1]
PD#TV-3999
Problem:
dtmb individual channel switching speed is slow,
it takes about 16s
Solution:
enable pts calculation when hold video
state changes.
Verify:
X301
Change-Id: I4c8eda3af3df894d8116461abf63c3dda45c8ce3
Signed-off-by: Rui Wang <rui.wang@amlogic.com>
zhiwei.yuan [Wed, 3 Apr 2019 09:18:25 +0000 (17:18 +0800)]
vdin: add new interface for passing dma-buf to vdin [1/1]
PD#TV-3863
Problem:
gpu cann't get vdin buf directly
Solution:
vdin write data to the addr passed by upper layer
Verify:
verified by t962x2_x301
Change-Id: I495b78c419e10a6dacb9b9f29c0f8e87339ac195
Signed-off-by: zhiwei.yuan <zhiwei.yuan@amlogic.com>
Zhe Wang [Tue, 14 May 2019 06:14:11 +0000 (14:14 +0800)]
audio: add clk tuning_enable/start_enable control in dts [1/1]
PD#SWPL-8306
Problem:
speaker without audio on S400. sideeffect of SWPL-7680
Solution:
add control interface in dts to enable clk tuning
and start clk before codec init
Verify:
verify on S400
Change-Id: Ic9f4e7b13b7d4ced18852346cdc7cf5f48e510dc
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
Jianxin Pan [Tue, 14 May 2019 06:00:03 +0000 (14:00 +0800)]
debug: do not print old_size when ftrace_size is 0 [1/1]
PD#SWPL-6028
Problem:
do not print old_size when ftrace_size is 0
Solution:
do not print old_size when ftrace_size is 0
Verify:
TL1 x301
Change-Id: I00a71c83fede14a2606c5e7eea5d8c4fdaeb5553
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
Jiamin Ma [Mon, 13 May 2019 11:55:20 +0000 (19:55 +0800)]
Scripts: add auto weekly change generator [1/1]
PD#SWPL-8487
Problem:
Manully generating weekly change is time wasting, we
need some helpers
Solution:
Add auto weekly change generator
Verify:
Locally pass
Change-Id: Ifafcd7d82eebcceaf45676056de4217260f18a5c
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
Cheng Tong [Mon, 13 May 2019 02:28:24 +0000 (10:28 +0800)]
dts: flanklin update dvb dts to adapte attach mode [1/3]
PD#SWPL-8315
Problem:
flanklin dvb dts used 3.14 mode
Solution:
flanklin update dvb dts to adapte attach mode
Verify:
verify it on franklin.
Change-Id: I53a9ed2c6f28e75cbb327c2d1c122622b2e4b23e
Signed-off-by: Cheng Tong <cheng.tong@amlogic.com>
Blance Tang [Wed, 8 May 2019 02:54:54 +0000 (10:54 +0800)]
buildroot: Enable USB3 phy for W400 [1/1]
PD#SWPL-8189
Problem:
USB3 disk can't be detected
USB3 phy is disabled on dts file, but HW connection is OK in W400
platform
Solution:
Enable USB3 phy in W400 dts file
Verify:
Local
Change-Id: I3bf1cf2619946d82aedc1c18840ebed34bbc2fdd
Signed-off-by: Blance Tang <guofeng.tang@amlogic.com>
Jian Cao [Wed, 8 May 2019 13:41:58 +0000 (21:41 +0800)]
ge2d: correct YUV limit/full range config when RGB->YUV [1/1]
PD#OTT-3500
Problem:
Grey-scale graph image on video layer performance worse.
Solution:
correct YUV limit/full range config to set ge2d,
when converting RGB to YUV.
Verify:
G12B_W400 board.
Change-Id: I304298a0a6942482196fe5d56a0f356fb30cbe61
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
Pengcheng Chen [Sun, 5 May 2019 08:54:58 +0000 (16:54 +0800)]
osd: calc osd parameters used num/den replace left/right shift [1/1]
PD#OTT-3615
Problem:
a line on the right displayed
Solution:
calc osd parameters used num/den replace left/right shift
Verify:
Verfied on u212
Change-Id: If59d9de0bb3c525d2b67d05ec449d458fbbcdfe2
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
Yong Qin [Fri, 10 May 2019 03:15:58 +0000 (11:15 +0800)]
cec: enable two IP, share cec pin mux on TM2 [1/1]
PD#SWPL-5638
Problem:
tm2 ab311 only have one pin for every ip,
when enable two cec IPs, need share pin mux to
another IP
Solution:
when enable two IPs, enable pinmux share.
Verify:
ab311
Change-Id: I4845418b8d6c9bd6b9512a8479311489a42740d1
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
Yong Qin [Fri, 1 Mar 2019 06:30:34 +0000 (14:30 +0800)]
cec: cec version is not 1.4 when do cts [1/1]
PD#SWPL-5045
Problem:
cts cec version is not right
Solution:
cec version 1.4
Verify:
android p
Change-Id: Iffb9712ce2f7724e9dd0abd9119588a9914159a4
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
Gongwei Chen [Fri, 10 May 2019 10:57:22 +0000 (18:57 +0800)]
common: support tp CST226 for yeke [3/3]
PD#SWPL-8013
Problem:
support touchpanel CST226 for yeke.
Solution:
support touchpanel CST226 for yeke.
Verify:
verify by u202.
Change-Id: I4a994ed97f56a4486f3ab39c3e2cd0e5fbed667e
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>
Gongwei Chen [Tue, 7 May 2019 10:59:02 +0000 (18:59 +0800)]
dts: add touch screen dts config for CST226 [1/1]
PD#SWPL-8013
Problem:
separate dts config from driver
Solution:
separate dts config from driver
Verify:
verify by u202
Change-Id: I4de45ec213b86d12cdd9296f80de62f4f2dc6713
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>
nengwen.chen [Mon, 6 May 2019 08:02:55 +0000 (16:02 +0800)]
atv_demod: add atbm2040 tuner support [1/3]
PD#TV-5499
Problem:
add atbm2040 tuner support.
Solution:
add atbm2040 tuner support.
Verify:
Verified by x301.
Change-Id: I89f82727c7c11f5fc6377584d519a17fe3449c4a
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
Luan Yuan [Tue, 30 Apr 2019 11:05:19 +0000 (19:05 +0800)]
common: support tp CST226 for yeke [1/1]
PD#SWPL-8013
Problem:
support touchpanel CST226 for yeke.
Solution:
support touchpanel CST226 for yeke.
Verify:
verify by u202.
Change-Id: Id74df3e25761118db4c10706128df29eb6eb2894
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
Ruixuan Li [Thu, 18 Apr 2019 07:48:44 +0000 (15:48 +0800)]
emmc: report response crc error on tl1 when hs400 200M busmode [1/1]
PD#SWPL-7740
Problem:
tl1 report response crc error on tl1 when hs400 200M busmode
Solution:
find a eyetest hole between 14-20 or 48-54, otherwise
tuning tx_delay and find again
Verify:
passed on tl1_skt
Change-Id: I46e2c3c4d7ef24bcac7b44fee73112894540fc33
Signed-off-by: Ruixuan Li <ruixuan.li@amlogic.com>
Yong Qin [Thu, 9 May 2019 11:55:51 +0000 (19:55 +0800)]
cec: cec a support multi-logical addr for tm2 [1/1]
PD#SWPL-5637
Problem:
1.verify cec a function on tm2
2.cec a support multi-address
Solution:
verify the cec a multi-addr function
Verify:
ab311
Change-Id: I641621212fa3096b3906a87d443c7bd40cb6d7e9
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
qingwei.xu [Thu, 9 May 2019 13:23:47 +0000 (21:23 +0800)]
dts: Add g12a_s905y2_u223_lp.dts for S905Y2 U223 [1/1]
PD#SWPL-8127
Problem:
Add g12a_s905y2_u223_lp.dts for S905Y2 U223
Solution:
Add g12a_s905y2_u223_lp.dts for S905Y2 U223
Verify:
u223
Change-Id: If1d5472817d2abc3b350900944f1d726d72b853f
Signed-off-by: qingwei.xu <qingwei.xu@amlogic.com>
qingwei.xu [Thu, 9 May 2019 08:01:04 +0000 (16:01 +0800)]
hdmitx: Disable dongle_mode case for S905Y2 U223 low power [1/1]
PD#SWPL-8127
Problem:
Disable dongle_mode case for S905Y2 U223 low power
Solution:
Disable dongle_mode case for S905Y2 U223 low power
Verify:
u223
Change-Id: Ie734fe02bb920a22efcb8c64d814a5158cec2c1d
Signed-off-by: qingwei.xu <qingwei.xu@amlogic.com>
Bencheng Jing [Mon, 6 May 2019 08:28:07 +0000 (16:28 +0800)]
amvecm: fix dnlp_en enable/disable not work [1/1]
PD#SWPL-7782
Problem:
dnlp_en enable/disable not work
Solution:
add tm2 support for dnlp enalbe/disable
Verify:
tm2
Change-Id: Ia0cf32a8f155b1e364b2aaf096f70f4f0a1ed50a
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
qingwei.xu [Thu, 9 May 2019 06:58:59 +0000 (14:58 +0800)]
power: Set the maximum CPU freq to 1.8GHz and GPU freq to 850MHz [1/1]
PD#SWPL-8127
Problem:
Set the maximum CPU freq to 1.8GHz and GPU freq to 850MHz
Solution:
Set the maximum CPU freq to 1.8GHz and GPU freq to 850MHz
Verify:
u223
Change-Id: I184da235469eca1f60842e3bf68ee897b1ea5307
Signed-off-by: qingwei.xu <qingwei.xu@amlogic.com>
Tao Zeng [Tue, 7 May 2019 02:51:42 +0000 (10:51 +0800)]
kasan: rebuild address layout after vmalloc increased [1/1]
PD#SWPL-8132
Problem:
In Jira TV-5143, final fix change have increased 128MB address space
for vmalloc. Because binder wasted too many vmalloc space but it's
hard to fix it in kernel side.
Due to incease of vmalloc address space, old design of address space
layout for KASAN32 is not suitable after this change. So we need to
change memory layout to fix this problem and let KASAN can running OK
again.
Solution:
1, rebuild address space layout for kasan
2, make kasan compatible with vmap stack config
Verify:
p212
Change-Id: I2ce8a840df0ce1fcda61ebeb14a64b1d609719ca
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
Shuai Li [Mon, 6 May 2019 11:13:08 +0000 (19:13 +0800)]
audio: add lock for resampler [1/1]
PD#SWPL-8134
Problem:
kernel NULL pointer for aml_resample_enable
Solution:
add lock for resampler
Verify:
Need stress test for x301
Change-Id: I1bbf5d7aeab681399c93f0cba9cc59195d3be0d6
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
MingLiang Dong [Wed, 8 May 2019 12:32:31 +0000 (20:32 +0800)]
hdr: fix sm1 hdr color abnormal [1/1]
PD#SWPL-7932
Problem:
sm1 play hdr video, color abnormal
Solution:
cgain coef1 set according to bitdepth
Verify:
verify on sm1
Change-Id: Ibef6e127dde57d47f9b9ec7a4233ee10fe8539d5
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
cancan.chang [Fri, 26 Apr 2019 11:59:59 +0000 (19:59 +0800)]
npu: check chip whether contain npu module [1/2]
PD#SWPL-7761
Problem:
S922X revb boot up fail
Solution:
add check function
Verify:
test pass at g12b revb
Change-Id: I17de7f9f82e09c68e27668288cb001e975785f5b
Signed-off-by: cancan chang <cancan.chang@amlogic.com>
Guosong Zhou [Fri, 26 Apr 2019 09:26:10 +0000 (05:26 -0400)]
isp: check chip whether contain isp module [2/2]
PD#SWPL-7761
Problem:
S922X revb boot up fail
Solution:
add check function
Verify:
test pass at g12b revb
Change-Id: I6a6842a3578f2a9bd4d6879a0f9632a28c099afb
Signed-off-by: Guosong Zhou <guosong.zhou@amlogic.com>
Luan Yuan [Wed, 8 May 2019 08:07:14 +0000 (16:07 +0800)]
common: lcd: support yeke panel [1/1]
PD#SWPL-8219
Problem:
not support lcd panel in ac202
Solution:
support lcd panel.
Verify:
verify by ac202.
Change-Id: Ib462a3536c21f0a55c0e0ff947f01c8f52ef3f13
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
Luan Yuan [Wed, 8 May 2019 06:12:24 +0000 (14:12 +0800)]
dts: add ac202 for s905d3 panel [1/3]
PD#SWPL-8219
Problem:
not support S905D3 panel
Solution:
add ac202 for S905D3 panel
Verify:
verify by ac202
Change-Id: I32188a8bbf7c25c490bf4735c55e63a3a92ef149
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
Luan Yuan [Tue, 30 Apr 2019 13:05:18 +0000 (21:05 +0800)]
common: lcd: support yeke panel [2/5]
PD#SWPL-8001
Problem:
support lcd panel.
Solution:
support lcd panel.
Verify:
verify by u202.
Change-Id: If0f665944c9a91a39c6fbd101e24878705284732
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
Yingyuan Zhu [Wed, 24 Apr 2019 09:50:29 +0000 (17:50 +0800)]
tm2: add SWD interface [3/3]
PD#SWPL-5647
Problem:
tm2 does not support SWD mode.
Solution:
add code to support SWD mode.
Verify:
test pass on ab311
Change-Id: If85a050b5033242200dd7163a8391e71960621f0
Signed-off-by: Yingyuan Zhu <yingyuan.zhu@amlogic.com>
Zhe Wang [Mon, 6 May 2019 13:14:14 +0000 (21:14 +0800)]
audio: set hdmi format-check threshold by input samplerate [2/2]
PD#SWPL-6340
Problem:
ddp audio input from hdmiin is not smooth
Solution:
set hdmiin format-check threshold by input sr
Verify:
Verified by x301.
Change-Id: Idb8ffa616c3880b1c34d61ca4e8c2917343a9ffc
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>