Commit Graph

648269 Commits

Author SHA1 Message Date
Zhongfu Luo
f069b72d3d dts: GXL: defendkey: support secure upgrade check [3/3]
PD#SWPL-2100

Problem:
GXL need to support secure upgrade check

Solution:
add defendkey support in all GXL dts

Verify:
GXL skt board verify pass

Change-Id: I73b84b86f23f512ddc556b61f3a07d015c717e8c
Signed-off-by: Zhongfu Luo <zhongfu.luo@amlogic.com>
2018-11-25 20:26:47 -08:00
Zhongfu Luo
1864e7dcf4 GXL: defendkey: support secure upgrade check [2/3]
PD#SWPL-2100

Problem:
GXL need to support secure upgrade check

Solution:
1.add dtb decrypt support
2.add 32bit defendkey support

Verify:
GXL skt board verify pass

Change-Id: I501967530b2a61d9b90c20241b82f92b00829453
Signed-off-by: Zhongfu Luo <zhongfu.luo@amlogic.com>
2018-11-25 20:24:51 -08:00
Hong Guo
fbceeb73ca PM_SUSPEND: suspend: set wakeup reason to stick mem [2/2]
PD#SWPL-2287

Problem:
set wakeup reason to stick mem

Solution:
set wakeup reason to stick mem

Verify:
gxl,test pass

Change-Id: Iff6f1824ea4ac9ec12b8295d4283992fdac03b14
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2018-11-25 20:09:47 -08:00
Jianxin Pan
6b24784c72 Merge "deinterface: temporary remove afbc support on chip after g12a [1/1]" into amlogic-4.9-dev 2018-11-25 19:25:06 -08:00
Hanjie Lin
6b165f762d dts: aarch32: modify timer for aarch32 [1/1]
PD#SWPL-2383

Problem:
32bit_kernel VtsKernelLinuxKselftest module 1 fail

Solution:
modify timer for aarch32

Verify:
p321

Change-Id: I9ef79e927f3244223dbbb57bcc6155c1ffc8989c
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2018-11-25 18:46:40 -08:00
wenfeng.guo
e6c27bb8b1 deinterlace: fix CMA layout adaptation di_cma_reserved [1/1]
PD#SWPL-2308

Problem:
CMA layout adaptation di_cma_reserved cause crash

Solution:
fix CMA layout adaptation di_cma_reserved

Verify:
P321

Change-Id: Ia24e811a02d47d70afa1c06361fd0852c357394c
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
2018-11-25 18:15:21 -08:00
Jianxiong Pan
eb0585ff90 Revert "arm: dts: tl1: add tl1 device tree fils [1/1]"
This reverts commit 32cfa235e3.

Change-Id: I23d0e860bd858e1a9982151977524b178524842a
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2018-11-24 00:46:29 +08:00
huaihao.guo
69b34885a1 deinterface: temporary remove afbc support on chip after g12a [1/1]
PD#172587

Problem:
afbc now support on chip txlx and g12a,
but we use cpu_after_eq(G12A) to judge
if afbc is support or not.

Solution:
use is_meson_g12a_cpu() replace cpu_after_eq(G12A).

Verify:
u200(g12a),t962x_r311

Change-Id: I3fb7ed54f7137fada97481177e40a2543cf8df9f
Signed-off-by: huaihao guo <huaihao.guo@amlogic.com>
2018-11-23 16:10:01 +08:00
Bo Yang
32cfa235e3 arm: dts: tl1: add tl1 device tree fils [1/1]
PD#172587

Problem:
Bringup TL1 support.

Solution:
Add tl1 device tree files to support tl1 boards.
This device tree files are copied from bringup branch:
bringup/amlogic-4.9/tl1-20181111

Verify:
The device tree files has been verified on bringup branch:
bringup/amlogic-4.9/tl1-20181111

Change-Id: Ie85f59a0293319a3511371ab69f3ce07f0fefed3
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2018-11-23 00:03:22 -08:00
Nian Jing
85db5ff49c vdac: fix atv/dtv resume no signal issue [1/1]
PD#SWPL-2351

Problem:
atv/dtv no signal when suspend after switch from hdmi

Solution:
disable vdac bandgap when suspend

Verify:
test pass on P321

Change-Id: I0449f0d9673f46928b8951249f5759a4a1f16562
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-11-23 00:00:36 -08:00
MingLiang Dong
95a57200d4 vpp: fix p212 osd sdr2hdr luma too dark compile [1/1]
PD#SWPL-1707

Problem:
{NTS}Manual,HDR-001-TC2 Failed step 8/12/16/20 VID
and GFX doesn't match

Solution:
add osd hdr2sdr convert table for 400nit on p212

Verify:
verify on p212

Change-Id: I16637652b6d07ba81b25f46c2684ff7ae3e1c68c
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-11-23 01:28:11 -05:00
MingLiang Dong
c5ea5368e1 vpp: fix p212 osd sdr2hdr luma too dark [1/1]
PD#SWPL-1707

Problem:
{NTS}Manual,HDR-001-TC2 Failed step 8/12/16/20 VID
and GFX doesn't match

Solution:
add osd hdr2sdr convert table for 400nit on p212

Verify:
verify on p212

Change-Id: I9a9dcf13ab0deaa8b676c5c409919367420b6d1b
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-11-22 21:54:55 -08:00
Jianxiong Pan
0fdc250927 ramdump: fix a warning of cast [1/1]
PD#165764

Problem:
have a warning of the "ram" variable cast.

Solution:
add a "void *" to the ram variable.

Verify:
test locally.

Change-Id: I037a89a28e98ae8c8ab965e908877bf4a72d3ead
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2018-11-23 12:31:16 +08:00
wenfeng.guo
4628782844 dtv_demod: fix dtv demod crash switch once every 2s [1/1]
PD#SWPL-2293

Problem:
dtv demod switch once every 2s cause crash

Solution:
fix dtv demod crash switch once every 2s

Verify:
P321

Change-Id: Ibfd919a503e3dae41f51637cdff6e01ed27bac71
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
2018-11-22 18:55:28 -08:00
live.li
97aec8956f avsync: tsync: fix the avsync problem [1/1]
PD#SWPL-1158

Problem:
The video will become un-smooth after change
between several audio languages

Solution:
when apts and vpts distance is large then 60*90000
then set the tsync mode to vmaster and  set the tysnc
enable to 0

Verify:
P321

Change-Id: I7c7e32f49ca12645cf6a1aa58caeb968a9234c8c
Signed-off-by: live.li <live.li@amlogic.com>
2018-11-22 18:04:31 -08:00
tao zeng
fdcfc036db ramdump: add ramdump support for ARM32 [1/1]
PD#165764

Problem:
ramdump is not enabled on ARM32

Solution:
Enable it and fix compatible with ARM64

Verify:
R311

Change-Id: I337ef019ecab05d25b7d9dc0cacab7a03149aa7b
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2018-11-22 17:52:23 -08:00
MingLiang Dong
204b1a4caa amvecm: pq: add dnlp/bri/contrast for tl1 [1/1]
PD#172587

Problem:
dnlp/bri/contrast can not finetune

Solution:
1. add dnlp regisiter 10bit write
2. add brightness/contrast/sr for tl1

Verify:
verify on tl1

Change-Id: I90b363f57fbf2cd485e2acaddb5ce60a8715a47b
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-11-22 05:57:07 -08:00
Wencai You
08ce5f4781 irblaster: add synchronous transmit [1/1]
PD#SWPL-2170

Problem:
cts fail
android.hardware.consumerir.cts.ConsumerIrTest#test_timing

Solution:
add synchronous transmit
when it returns the pattern has been transmitted

Verify:
verify on franklin

Change-Id: I7e490236e5effc13f81e4fab3a1c7fc10c5dcfb3
Signed-off-by: Wencai You <wencai.you@amlogic.com>
2018-11-22 02:56:23 -08:00
Hong Guo
648fc94783 vrtc: vrtc time update for stick mem [2/2]
PD#174867

Problem:
vrtc time update for stick mem.

Solution:
vrtc time update for stick mem.

Verify:
g12a txl.

Change-Id: I65074422569370b253882a4e66fb771da10ccdbf
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2018-11-22 00:41:48 -08:00
guotai.shen
459b677e49 dts: r314: increase board dts file [2/3]
PD#SWPL-1978

Problem:
bring up board r314.

Solution:
increase board dts file

feature:
The Dts file with Einstein is identical except for the memory difference
R314 1.5G, Einstein 1G.

Verify:
Verified on txlx_t962x_r314  board.

Change-Id: I271cb92a9cbcab174fb0bb76cfbc8beff9c730d3
Signed-off-by: guotai.shen <guotai.shen@amlogic.com>
2018-11-22 00:27:24 -08:00
Nanxin Qin
c1f571303d dts: the memory of the reserved 1MB was recovered. [1/1]
PD#SWPL-2250

Problem:
h265 & vp9 4K playback abnormal because HEVC FRONT &
VPU READ2 pollute the phy address of near 0x0.

Solution:
it's only a temporary modification, the real reason
needs to take more time fixed.

Verify:
U212

Change-Id: I3dcc47f8979960e95c89cf53fe10eadc1a7ae5ad
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2018-11-21 18:06:38 -08:00
Renjiang Han
00c604ba1d ionvideo: Add thread stop protection when the process exits [1/1]
PD#SWPL-1689

Problem:
The thread still exists when the process exits

Solution:
Check if the thread exits when the process exits

Verify:
local

Change-Id: I6d805da6bfa0df85b6d39d065c95eed49b3cb7da
Signed-off-by: Renjiang Han <renjiang.han@amlogic.com>
2018-11-20 19:25:28 -08:00
Yonghui Yu
29e995bb40 mmc: fixup toshiba emmc secure discard [1/1]
PD#SWPL-1937

Problem:
secure discard and trim may cost 5mins on toshiba
"004GA0" emmc.

Solution:
using normal discard operation instead.

Verify:
W400

Change-Id: I7fd23867f8ae0af9192377de8f8c15609ef809ed
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
2018-11-20 19:25:00 -08:00
Jihong Sui
8b30813578 deinterlace: fix kasan bug in di_task_handle [1/1]
PD#173820

Problem:
kasan bug in di_task_handle

Solution:
delete cma_mutex because it has no effect

Verify:
P321

Change-Id: Ie6ca7973576e7350870c5466b54b38b490dff65e
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
2018-11-20 19:23:12 -08:00
tao zeng
be8267a8a4 ddr: fix dmc_monitor register bit missmatch on G12A/G12B [1/1]
PD#172256

Problem:
On G12A/G12B, bit for ddr0 protection 0 vilation is not same

Solution:
Fix bit missmatch problem

Verify:
U212

Change-Id: I5dca14c8bc96bdcb85dbe8bbd5a9a18157834bcf
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2018-11-20 19:21:38 -08:00
Zongdong Jiao
930be2c9dc hdmitx: fix wrong power uevent in suspend/resume [1/1]
PD#SWPL-1931

Problem:
Wrong hdmi_power uevent in suspend/resume flow

Solution:
Remove current mode judgement

Verify:
R321

Change-Id: Ib36e8d6cb4988f7b2be91146b12e974c194526ca
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2018-11-20 19:20:54 -08:00
Evoke Zhang
cc84915acf backlight: ldim: update usage for new spi driver [1/1]
PD#SWPL-1603

Problem:
don't support old spi driver now

Solution:
update new spi driver api for ldim driver

Verify:
txlx r311

Change-Id: I4dff13e4cab5666a30488730e27c6275b933a922
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-11-21 09:45:09 +08:00
Xindong Xu
1b61147efa dts: dtsi: add dtsi for ab update [1/6]
PD#SWPL-1513

Problem:
ab update can not work on P

Solution:
add dtsi for ab update for P

Verify:
test pass in ampere

Change-Id: I6ff219170a16c0081fba7297110e8dfaadcff401
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2018-11-20 00:35:43 -08:00
Yan Wang
4492288c13 DolbyFW: Dolby Firmware Protection Driver create [1/1]
PD#SWPL-739

Problem:
Dolby Firmware Protection Driver create.

Solution:
AXG support Dolby Firmware Protection.

Verify:
AXG S400

Change-Id: Id88ba3f99103f2978827a3394203f7eef6d889f4
Signed-off-by: Yan Wang <yan.wang@amlogic.com>
2018-11-20 15:47:21 +08:00
Nan Li
4d8102b4fb emmc: clean emmc reg val for probe [1/1]
PD#SWPL-2286

Problem:
emmc response crc error in emmc init.

Solution:
clean emmc reg val from uboot to kernel.

Verify:
w400

Change-Id: I6a4763187f18e9e284c887c5c788f3a88c8548ff
Signed-off-by: Nan Li <nan.li@amlogic.com>
2018-11-20 11:43:26 +08:00
yeping.miao
ebacf8c00c arm64: dts: p230: add dvb module
PD#172865

Problem:
Customer requests a new release for linux dvb
Need enable dvb for QA testing

Solution:
Need enable dvb for QA testing

Verify:

Change-Id: Ib082c457d6f43ef4d6a5d16059a7e8ce068a332e
Signed-off-by: yeping.miao <yeping.miao@amlogic.com>
2018-11-19 19:18:14 -08:00
Xindong Xu
44208c2449 reboot: reason: add reboot_reason quiescent [1/4]
PD#SWPL-1887

Problem:
Android TV need reboot_reason quiescent

Solution:
add reboot_reason quiescent

Verify:
ampere

Change-Id: Ie5a748faae05be93c56722b7806df6179116a047
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2018-11-19 17:49:55 -08:00
Shunzhou Jiang
a5912f41ec clk: g12a/g12b: fix 32bit set mpll clk overflow [1/1]
PD#SWPL-1933

Problem:
32bit system clk overflow

Solution:
let mpll clock not overflow

Verify:
g12b

Change-Id: Ie1c7c611e637776348bb35a3e0c1624cee57716f
Signed-off-by: shunzhou.jiang <shunzhou.jiang@amlogic.com>
2018-11-19 04:23:28 -08:00
Dezhi Kong
3a57d9af09 vdin: enable vdin0 urgent for T950 default [1/1]
PD#TV-288

Problem:
There is flicker and jitter in HDMI

Solution:
enable vdin0 urgent for T950 default

Verify:
p321-T950

Change-Id: I17e472d7a47411093e9ade70a342807bed060a3a
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
2018-11-19 04:22:21 -08:00
wenfeng.guo
ecadecb19d deinterlace: fix di coverity & di_trace [1/1]
PD#SWPL-2138

Problem:
Fix di coverity & di_trace

Solution:
fix di coverity & di

Verify:
T962X-R311

Change-Id: I9be91832eeed89ebd715276c75414e4e6da55240
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
2018-11-19 04:21:25 -08:00
nengwen.chen
24f10d7bc7 atv_demod: Output big "PO" sound when change source from ATV [1/3]
PD#SWPL-318

Problem:
Output big "PO" sound when change source from ATV to others,
or switch between small window and full screen in ATV source.

Solution:
disable atv status early when exit ATV source.

Verify:
verified by p321

Change-Id: I82af7f8eaef181f1f72ef1f9d194e33c1efdcdb5
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2018-11-19 04:20:34 -08:00
Nan Li
11c07e41eb sdio: optimize sd & wifi TDMA [1/1]
PD#SWPL-1908

Problem:
sdio wifi error TDMA.

Solution:
optimize host reg value set error.

Verify:
u211 & u212

Change-Id: I0e0d52ac2bce42cf163f0065d46badc938832a65
Signed-off-by: Nan Li <nan.li@amlogic.com>
2018-11-18 18:07:03 -08:00
wenfeng.guo
bd9fdb3f85 di: fix dump_status log error [1/1]
PD#174473

Problem:
dump_status log error

Solution:
fix dump_status log error

Verify:
verified in t962X_r311 board

Change-Id: I53cec7b93f6e2649bd527b8591995d54bec6450d
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
2018-11-16 07:55:42 -08:00
Bencheng Jing
d146035908 drm: pq: G12A DRM support gamma and ctm setting [1/1]
PD#165492

Problem:
G12A DRM add gamma and ctm setting  support

Solution:
1. amvecm: add gamma apis for drm
2. drm: add gamma and ctm setting

Verify:
Verified on customer platfor

Change-Id: Iff5204ae7f719542463ac15140e471cd762c9c27
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-11-16 07:36:33 -08:00
Yi Zhou
5684ce90ec dv: set avi info limited range when dv output hdr mode [1/1]
PD#SWPL-1127

Problem:
when dv output hdr mode, the quantization range is default value
instead of limited range

Solution:
set quantization range to limited range in avi info

Verify:
t962e (txlx)

Change-Id: Ib4fbeb1c7efcedd7194143772ee5c663284a1c77
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2018-11-16 07:33:24 -08:00
Jianxiong Pan
d792e1c648 dts: modify the remaining 64bit dts to support 32bit [1/1]
PD#SWPL-2046

Problem:
some of the remaining 64bit boards do not support 32bit.

Solution:
modify the dts to support 32bit.

Verify:
axg, g12a, g12b, gxl, gxm, txl, txlx.

Change-Id: I951f8d32b18243a64e2abc5008bbb015c2e21e7a
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2018-11-16 04:08:21 -08:00
Peng Yixin
3bfa529946 media: fix some coverity error: [1/1]
PD#SWPL-2053

Problem:
Coverity detected some code defects.

Solution:
Fixed these code defects.

Verify:
Verified u212

Change-Id: Ie3c0907c7ee3db94f65f58aa5d5c96812a7fe38c
Signed-off-by: Peng Yixin <yixin.peng@amlogic.com>
2018-11-16 03:16:59 -08:00
Nanxin Qin
16cbe10144 media: remap the addr to prevent crash on the 32bit & 2G board [1/1]
PD#SWPL-1909

Problem:
mem rw exception caused crashed.

Solution:
1. add mapping the highmem address by the func vmap().
2. remove the flag CODEC_MM_FLAGS_CPU if not necessary.

Verify:
p212, w400

Change-Id: I982c775d7c009335cae5802f0eb6287d22037db6
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2018-11-15 19:59:19 -07:00
tao zeng
8d0507c810 dts: change CMA layout [1/1]
PD#SWPL-1909

Problem:
On 32bit kernel, codec cma is located in normal zone by
"alloc-ranges" parameter with large size. This takse up
memory space for kernel and drivers. Sometimes we can see
memory allocation fail log but there are still enought
free pages. But most of these pages are CMA pages.

Solution:
Move codec cma location to high memzone. On 32bit, low
768MB memory is normal zone.
This change also correct first 1MB memory lost problem
for chips later than TXLX

Verify:
P212

Change-Id: I4592d34d08ee4dbb6700bbbfc4e0fadaceab0310
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2018-11-15 18:38:25 -07:00
huaihao.guo
d6aa1270e0 deinterface: add afbc support on g12a and txlx [1/1]
PD#SWPL-1618

Problem:
Add afbc support on g12a and txlx

Solution:
add afbc support on g12a and txlx

Verify:
T962X-R311, U200(G12A)

Change-Id: Ia0cce8516a98653b01c3bc628e812c3a81b1df59
Signed-off-by: huaihao.guo <huaihao.guo@amlogic.com>
2018-11-15 08:36:16 -07:00
Huan Biao
745ff71031 thermal: sensor: fix thermal disabled mode issue [1/1]
PD#SWPL-2130

Problem:
tsensor driver update thermal event when mode disabled

Solution:
fix tsensor disable mode issue

Verify:
A311D W400 pass

Change-Id: If9e3d3ea15732a0efbd8314003b27bc0bdf3e476
Signed-off-by: Huan Biao <huan.biao@amlogic.com>
2018-11-15 15:24:47 +08:00
MingLiang Dong
572b617418 amvecm: overscan: fix video local play, screen mode set error [1/1]
PD#SWPL-206

Problem:
overscan set error when local play

Solution:
overscan don't set at vpp

Verify:
verify on txlx

Change-Id: Ifd4ad4f5fcdb9fbc7ad05a540d0ed11b24d4ca66
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-11-14 00:49:44 -07:00
live.li
1536663ad1 tsync: tsync change the apts set code [1/2]
PD#SWPL-1774

Problem:
DD program has avysnc problem over one night play

Solution:
fix the apts set bug

Verify:
p321

Change-Id: I0f6a5b47d3e3171a3dd8fa9a0b721cd11ec20b9e
Signed-off-by: live.li <live.li@amlogic.com>
2018-11-14 00:03:24 -07:00
Zongdong Jiao
394499b97e hdmitx: remove a wrong Y422 format judgement [1/1]
PD#IPTV-55

Problem:
When connect to a Samsung TV(support 4k60 422 12bit), get a wrong
0 of 'echo 2160p60hz422,12bit > valid_mode'

Solution:
Remove a wrong Y422 format judgement

Verify:
P212

Change-Id: Ic0f2cefc1e0893390ac38298b55272877d81e04b
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2018-11-13 20:09:08 -07:00
Zongdong Jiao
ff97a4ee6c hdmitx: enable repeater_tx in r321/atom dts [2/3]
PD#SWPL-1303

Problem:
For TXLX/T962E/R321 cases, there are both HDMI TX and RX.
Should consider it as repeater.

Solution:
Enable repeater_tx in r321/atom dts
Also, add a missing ksv_lists[] clear.

Verify:
r321/atom

Change-Id: I7b512c34123481380220f9262466fde56b0ae6e3
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2018-11-13 20:08:40 -07:00