Commit Graph

646309 Commits

Author SHA1 Message Date
pengcheng chen
bc0b7dbd2f osd: osd suspend fail issue
PD#164508: osd: suspend fail issue

Change-Id: I673a907bea2abf37d09967ef0e0a924806ce6fae
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-05-22 00:35:57 -07:00
Weiming Liu
caa103fec4 lcd: local dimming: add unifykey support [2/2]
PD#166418: ldim: add unifykey support

Change-Id: I0cb7629ed9824c50d5f85b7ec34e26c165a60a1e
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
2018-05-22 00:33:49 -07:00
Hong Guo
8972fe74ef arm64: dts: g12a: add cpufreq 1.908G.
PD#165143: cpufreq: add cpufreq 1.908G.

Change-Id: Id8cca5402a02372247def759ff455ef5bbe11f05
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2018-05-22 00:32:53 -07:00
Lei Qian
3efa699da6 dts: enable picdec [1/1]
PD#166830: dts: enable picdec

or we can't play 4K picture

Change-Id: I7109cd421608a82fb5cd05617bf4065d4897a430
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
2018-05-22 00:31:24 -07:00
Zhuo Wang
9ce4990c26 ethernet: add wol for internal phy
PD#166640: add wol for internal phy

Change-Id: I1c34af9022e5aa4968516d6826089531b55a1c10
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
2018-05-21 22:45:42 -07:00
Cheng Tong
7b7aa7c419 dts: unify dvb dts definition
PD#163384: dts: unify dvb dts definition

Change-Id: I323c9200d2441aa8d40f4972612f9ecfbf0edc5b
Signed-off-by: Cheng Tong <cheng.tong@amlogic.com>
2018-05-21 21:18:20 -07:00
Evoke Zhang
0a7c4c7009 vout: optimize invalid mode management for init
PD#166032: vout: optimize invalid mode management for init

Change-Id: I16d36b1745faf0adf8316837d3df2d061ea94dda
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-05-21 21:15:51 -07:00
pengcheng chen
2d36db0821 osd: fix dfbshow can't show picture
PD#165698: osd: fix dfbshow can't show picture

Change-Id: I0f13537391c98f106a5154d498ef46af90aa7690
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-05-21 21:13:36 -07:00
Victor Wan
324524de04 Merge branch 'android-4.9' into amlogic-4.9-dev 2018-05-22 10:48:42 +08:00
Weiming Liu
91448dd38f ldim: add db load support
PD#166311: lcd: add ldim db load support

Change-Id: I71c8a6d3b07daae63d19dec128da3c71a6031cba
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
2018-05-21 18:57:46 -07:00
shuze.ma
6aa8abc6e1 osd: support hw vsync [1/1]
PD#163001: osd: support hw vsync

Change-Id: I1e7f158b8cbc9434165745f77274ae353cfae342
Signed-off-by: shuze.ma <shuze.ma@amlogic.com>
2018-05-21 01:42:18 -07:00
gongwei.chen
e1163d785f IR: add S905X small IR remote on T962E
PD#165963: IR: add S905X small IR remote on T962E

Change-Id: I3d3bf0abaf30c0dc8d0ce925afeeefff6af27923
Signed-off-by: Gongwei Chen <gongwei.chen@amlogic.com>
2018-05-21 01:04:39 -07:00
tao zeng
93360111a8 mm: remove total summary of pagetypeinfo
PD#166462:

This caused vts VtsKernelProcFileApi on Android P failed.

Change-Id: I332c7ec324e7f87b0f8e0adeeef15cfd93f9b077
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2018-05-21 00:21:18 -07:00
nengwen.chen
8370bd9c39 atv_demod: Add atv afc [1/2]
PD#166320: Add atv afc.

Change-Id: I7b5d8d6290f1e394900b09a1147e7db5ec6fecf4
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2018-05-20 23:44:05 -07:00
Cheng Tong
700dc02512 dts: update p230 dts for attach mode
PD#163384: dts: update p230 dts for attach mode

Change-Id: Iac83d28e31883f812c05f7fcd0342b0f4f225475
Signed-off-by: Cheng Tong <cheng.tong@amlogic.com>
2018-05-20 22:46:59 -07:00
Xuhua Zhang
25eb2df116 vbi: fix vbi cc error
PD#161806: vbi: fix cc nosync and disappearance problem

Add interface to read real-time data what vbi-hw write to memory.

Change-Id: Ie36a9826ecf3320f7a1a366bac7a6a4f15e6f7d2
Signed-off-by: Xuhua Zhang <xuhua.zhang@amlogic.com>
2018-05-20 20:18:18 -07:00
Hong Guo
5732a2bd80 arm64: dts: g12a: fine-tune U220 OPP
PD#165143: fine-tune U220 OPP for stability.

Change-Id: I84d543519c9053db0060ba3d090c4ecc9f233fa8
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2018-05-20 19:56:54 -07:00
Yixun Lan
072d9f3eb0 reboot: make system reboot when panic occurs
PD#166529: reboot: make system reboot when panic occurs

CONFIG_PANIC_TIMEOUT=0 means no reboot when panic occurs,
This will make VTS stuck forever, fix this by making
the default reboot timeout as 5s.

Change-Id: Ib8888a4f87c6c178891d7e7fed2f186a6bfed119
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2018-05-18 04:19:16 -07:00
Zhongfu Luo
5847b4e8e5 dts: add defendkey function for G12A
PD#164929: G12A need to support defendkey

add defendkey function in all G12A dts

Change-Id: Id269d4c14f2c2a6ad0674191aff353122a13d558
Signed-off-by: Zhongfu Luo <zhongfu.luo@amlogic.com>
2018-05-18 03:27:16 -07:00
Zhuo Wang
83fd37b084 ethernet: fix wol_error when test eye_pattern
PD#166642: add eye pattern function for 4.9

Change-Id: If57f74262589c02e12cbff3f01745c70a687da9e
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
2018-05-18 03:14:29 -07:00
Zhongfu Luo
e9b555745a defendkey: support secure upgrade check
PD#164929: G12A need to support defendkey

Change-Id: I3c805c4dda03a39156fb91b53cc55ee8930f9e03
Signed-off-by: Zhongfu Luo <zhongfu.luo@amlogic.com>
2018-05-18 03:11:36 -07:00
libo
e5246d9cc9 wifi: enable cfg80211 testmode for qca6174
PD#166420: enable cfg80211 testmode for qca6174

Change-Id: I65f6fa499e02fdc48bc23f1e7541fd8e7fee4850
Signed-off-by: libo <bo.li@amlogic.com>
2018-05-18 02:37:08 -07:00
Yi Zhou
7f86bf6643 hdmitx: fix no display under frac_mode
PD#166241: hdmitx: fix no display under frac_mode

1.update pll parameters
2.4k60hz444/rgb8bit doesn't frac_mode

Change-Id: I45c8bade4cd8f83a7b4d36aadbdbbaa9dfca32f1
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2018-05-18 02:35:22 -07:00
Evoke Zhang
b9c7a6084e backlight: ldim: add remap function restrictions by ldim_func [2/2]
PD#166583: backlight: ldim: add remap function restrictions by ldim_func
also optimize iw7027 driver

Change-Id: I2a863d17d3cef521b6d7af016f4c47e29ef5b44b
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-05-18 01:52:02 -07:00
Brian Zhu
4b9e9da925 vpp: fix the vskip overflow when playing interlace video
PD#164722: vpp: fix the vskip overflow when playing interlace video

Change-Id: Id65e8c58aedf35da4762280ae19cf933f08786f9
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2018-05-18 01:10:28 -07:00
Sunny Luo
9e0f07a639 spicc: g12a: spicc0 pins_c debug
PD#166556: spicc: g12a: spicc0 pins_c debug

Change-Id: I4f5f118410617cc3de8a1132100a1f7e21bc9f66
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
2018-05-18 00:57:16 -07:00
Evoke Zhang
d7c0717528 u221: disable cvbsout [2/2]
PD#165555: u221: disable cvbsout
s905y2 don't support cvbsout

Change-Id: If29a9c6e9fa38cafcbcf6e75f942fb03b2cd5e1b
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-05-18 00:09:24 -07:00
MingLiang Dong
2ef44c846f hdr: add hlg support
PD#166567: hdr: add hlg support

Change-Id: I00acc352ce534485c8950f979704f96880811faa
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-05-17 18:44:30 -07:00
shuanglong.wang
5d61f94ef4 tsync: do not operate tsync_mode_switch before first video toggled.
PD#165355: do not operate tsync_mode_switch before first video toggled.
Some stream in tunnel mode, first audio pts is large than
AV_DISCONTINUE_THREDHOLD_MAX(60s). In audio_hw it will check pcr and
apts diff, so large difference between pcr and apts will lead sync mode
from amster to vmaster
[ 2414.316223@3] vdec_init, dev_name:ammvdec_vp9,
vdec_type=VDEC_TYPE_STREAM_PARSER
[ 2414.326361@3] vp9: ver (201602101,0) decinfo: 1920x1080 rate=4000
[ 2414.326827@3] mem_start_virt failed
[ 2414.330600@3] init_pic_list ok, used_buf_num = 12
[ 2414.336555@2] set pts unstable
[ 2414.338121@2] success set parent hevc_p1_composite rate to 666666666
[ 2414.356287@0]
A-discontinue,pcr=1500,vpts=0,apts=1500,diff_pts=16209420,lugsp_5ts6
207920
[ 2414.359685@0] discontinue-tsync_mode:A->Vvptatr:S->adji
ffies=204004utsize 12179
[ 2414.366696@0] debugcnt=0x10,diff_pts=16209420,tsync_mode=0

Change-Id: I7e33abb5e6c27169ecec86fb6e4df33de6bd80cf
Signed-off-by: shuanglong.wang <shuanglong.wang@amlogic.com>
2018-05-17 06:54:11 -07:00
shuanglong.wang
5ab25fe0db avsync: av not sync problem cased by vp9 trig
PD#161895: av not sync problem cased by vp9 trig

1)vp9 initialization stream do not post VIDEO_START event,
so do not post VIDEO_STOP in unregister when not post
VIDEO_START which occured in vp9 tirg reset codec operation.
2)AV audio master adjust pcr according apts diff in
tsync tsync_set_apts need to reopen which was commented in
the begining tree of 4.9 codec
3)summit as Tim's patch

Change-Id: I9fb62aecb27f75d1ea9dff938452e0dd4f11b901
Signed-off-by: shuanglong.wang <shuanglong.wang@amlogic.com>
2018-05-17 06:53:24 -07:00
kele bai
3305a0c5cb di: fix nr4 param sys interface crash
PD#166354: di: fix nr4 param sys interface crash

1) nr4 param array access violation

Change-Id: Ia79bd0ef8118715c6f1a94c5427c2c4b715f8bf8
Signed-off-by: kele bai <kele.bai@amlogic.com>
2018-05-17 06:35:08 -07:00
Lei Yang
f0328fe5e5 hdmirx: improve the snow noise issue during timing switching
PD#166184: hdmirx: improve the snow noise issue during timing switching

Change-Id: If143d418758f3b0d4895a7ecab87cebe98d8c457
Signed-off-by: Lei Yang <lei.yang@amlogic.com>
2018-05-17 05:40:29 -07:00
pengcheng chen
b3751daeec osd: add afbc arb reset which caused screen blank
PD#166248: osd: afbc arb reset which caused screen blank

Change-Id: I35035a40a50d5123394d527c60df2abb58e10b9a
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-05-17 05:27:20 -07:00
Xing Wang
d8b0e36be6 audio: codec: add suspend and resume for ad82584f
PD#165897: audio: codec: add suspend and resume for ad82584f

Change-Id: I5a98b4d19f4cc411ea2f94ab62bd323658fb1c25
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2018-05-16 22:30:23 -07:00
Evoke Zhang
f790c9bed5 lcd: add retry flow to ensure power on state
PD#166330: mipi panel status is incorrect sometimes when lcd enable

Change-Id: Iace4963e576752208815d672befa4e215f860097
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-05-16 02:40:56 -07:00
Weiming Liu
556215ab62 lcd: premote a common lcd_extern_i2c_probe
PD#164139: lcd: premote a common lcd_extern_i2c_probe

premote a common lcd_extern_i2c_probe() function,
so it will be shared by various display controller IC

Change-Id: I47638520f32a0865829a1fd776c3a9ca626798ba
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
2018-05-16 02:39:26 -07:00
MingLiang Dong
17d1b73f7a amvecm: fix G12A eye protect function unused
PD#165151: amvecm: fix G12A eye protect function unused

1. G12A use post matrix as wb adjust module
2. fix 905x eye protect function bug

Change-Id: Ic161cafbb455cf278283d20ef9d93f18c07f5811
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-05-16 02:23:03 -07:00
Jianxin Qin
110731404c usb: phy2: analog tuning for aml-phy
PD#164286: usb: phy2: analog tuning for aml-phy

Packet lost occures with high probability in High Speed mode, This patch
re-configurate PHY parameters for improving this issue.

Change-Id: If51d300a01d8c30dce27454ad887a0d14f2d1e52
Signed-off-by: Jianxin Qin <jianxin.qin@amlogic.com>
2018-05-16 01:08:45 -07:00
Ao Xu
21b537a651 script: amlogic: add code scan script
PD#166377: script: amlogic: add code scan script

Add code scan script.

Usage: ./script/amlogic/code_scan.sh [path]

Examples:
	# scan all code
	./script/amlogic/code_scan.sh

	# scan specified directory
	./script/amlogic/code_scan.sh drivers/amlogic

scan result is in src code's parent directory, named coverity_html

Change-Id: I069cd99d08014cc50a3bf127e199690649e196c8
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2018-05-16 01:02:03 -07:00
yicheng shen
bf188aa05d hdmirx: fixed the pink screen issue when connect with roku box
PD#165686: hdmirx: fixed the pink screen issue when connect with roku box

Change-Id: Ia1723b9e88bcf7dd0773bc301301e682d35a9c5c
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
2018-05-16 00:54:12 -07:00
hongmin hua
86d7bfd6fa cec: add err initiator int for cec error [2/3]
PD#163965: cec: add err initiator int for cec error

Change-Id: I7a10f4d6a90d2e3a15ec3ed969735aadb230db43
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
2018-05-16 00:05:03 -07:00
shuze.ma
00a2de0827 hdmitx: update hdmi phsycial size during hotplug [1/1]
PD#163001: update hdmi phsycial size during hotplug

Change-Id: I71e863c56abbe5ae8dd151de481b1465317cebf1
Signed-off-by: shuze.ma <shuze.ma@amlogic.com>
2018-05-15 20:05:08 -07:00
Xingyu Chen
b65a914943 arm64: dts: txlx: adjust the position of saradc node
PD#165196: arm64: dts: txlx: adjust the position of saradc node

In order to compatible with the saradc driver in uboot, the node
must be placed in the /{}.

Change-Id: I135a89866249b23b89f466699ecdb8cd7f21db82
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2018-05-15 18:55:10 -07:00
yicheng shen
89905942e2 hdmirx: add new atmos edid handle method
PD#164867: hdmirx: add new atmos edid handle method

Change-Id: I03865be263d195b3b38bf782bd52b992e2084c71
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
2018-05-15 04:52:43 -07:00
Mark Rutland
d1a183b101 arm64: cpufeature: Pass capability structure to ->enable callback
PD#166068: arm64: cpufeature: Pass capability structure to ->enable callback

Fix CPU-hotplug fail to bringup issue once stopped CPU.

From: Will Deacon <will.deacon@arm.com>

commit 0a0d111d40 upstream.

In order to invoke the CPU capability ->matches callback from the ->enable
callback for applying local-CPU workarounds, we need a handle on the
capability structure.

This patch passes a pointer to the capability structure to the ->enable
callback.

Change-Id: I2c002dfbba4e923d0e44ab085ede46e6f47c9755
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com> [v4.9 backport]
Tested-by: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2018-05-15 04:22:05 -07:00
Mark Rutland
484099ffe9 arm64: cpufeature: __this_cpu_has_cap() shouldn't stop early
PD#166068: arm64: cpufeature: __this_cpu_has_cap() shouldn't stop early

From: James Morse <james.morse@arm.com>

Fix CPU-hotplug fail to bringup issue once stopped CPU.

commit edf298cfce upstream.

this_cpu_has_cap() tests caps->desc not caps->matches, so it stops
walking the list when it finds a 'silent' feature, instead of
walking to the end of the list.

Prior to v4.6's 644c2ae198 ("arm64: cpufeature: Test 'matches' pointer
to find the end of the list") we always tested desc to find the end of
a capability list. This was changed for dubious things like PAN_NOT_UAO.
v4.7's e3661b128e ("arm64: Allow a capability to be checked on
single CPU") added this_cpu_has_cap() using the old desc style test.

Change-Id: I29788b05eb636de777de5d4f423097804d465a7b
CC: Suzuki K Poulose <suzuki.poulose@arm.com>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com> [v4.9 backport]
Tested-by: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2018-05-15 04:21:16 -07:00
Jihong Sui
d9e5bb5cc1 hdr: fix the bug that sdr can't switch to hdr for g12a
PD#166004: hdr: fix the bug that sdr can't switch to hdr for g12a

Change-Id: Ia7c14f86d63aa8b00617c47abad14e2eab96d2f6
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
2018-05-15 02:14:03 -07:00
Hong Guo
b1afe9a41a arm64: dts: g12a: add cpufreq 1.92G.
PD#165143: cpufreq: add cpufreq 1.92G.

Change-Id: I8b9dddf8c4c138bf4b5763f707c174ad48e8a53a
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2018-05-15 02:13:24 -07:00
bin pang
27336a865c audio: add 16K mic aux and 32bit feature
PD#164543: audio: 16K mic aux and 32bit support[2/2]

Change-Id: I7e19374cae45821c6189c60eff4b1e2d872ba4c6
Signed-off-by: bin pang <bin.pang@amlogic.com>
2018-05-15 00:58:54 -07:00
Jian Hu
af5ce8ab69 arm64: dts: g12a: add default drive strength for i2c controllers
PD#165715: arm64: dts: g12a: add default drive strength for i2c controllers

Change-Id: I4d909e25d08fa29ac6ebdf756af76bef86bf0bf6
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-05-14 23:51:08 -07:00