Commit Graph

649178 Commits

Author SHA1 Message Date
MingLiang Dong
7869ba630d hdr: optimize osd sdr2hdr color/luminance [1/1]
PD#SWPL-17683

Problem:
1. osd sdr2hdr color is different with video
2. osd sdr2hdr luminance is too high with astro pattern

Solution:
1. osd sdr2hdr matrix set 709 to 2020
2. osd sdr2hdr max luminance set 330

Verify:
verify on p212

Change-Id: I9c452f5bb2573089904e280a6e6ff98bea9441ab
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2020-02-04 16:59:34 +09:00
Zhengrong.Zhu
6c9ae88176 hdmitx: Coverity(upgraded) defect cleanup: hdmitx [1/1]
PD#SWPL-16574

Problem:
Coverity(upgraded) defect cleanup: hdmitx

Solution:
Modify code according to coverity

Verify:
verify on the board of U212

Change-Id: Iac69fb896dd22b38ae56b58701d6fd26aefe958c
Signed-off-by: Zhengrong Zhu <zhengrong.zhu@amlogic.com>
2020-02-04 16:59:26 +09:00
Zongdong Jiao
313dac7573 hdmitx: revert original hpd_state mark [1/1]
PD#SWPL-17710

Problem:
Suppose hdmitx already output in uboot, and next kernel boots up,
the output will disable and then enable

Solution:
When hdmitx hpd_states initializes, read edid when hpd is high

Verify:
G12/U212

Change-Id: I538b8af2d59a7b2b34739f14d0b0cb6fd89aed2e
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2020-02-04 16:54:16 +09:00
Brian Zhu
885d844b61 dv: improve the dv process flow [1/1]
PD#SWPL-18116

Problem:
Under keeping frame case, dv toggle frame with wrong
mode, it may cause non-dv effect .

Solution:
Improve the toggle flow , pass the correct mode into
dv driver. Then using the last meta data

Verify:
Verified on u212

Change-Id: I456bb16e16810c166aba23d07a3296595032861e
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2020-02-04 16:54:05 +09:00
renjiang.han
cc9016c91e video_keeper: use ge2d keep last frame. [1/1]
PD#SWPL-17670

Problem:
can't keep last frame with ge2d.

Solution:
Use the address of the vframe to make a judgment.

Verify:
on w400

Change-Id: Id652500d77d5b70837f29606b6336c592580d466
Signed-off-by: renjiang.han <renjiang.han@amlogic.com>
2020-02-04 16:53:55 +09:00
renjiang.han
6bc70d79c0 ppmgr: Vf canvas configuration finishing. [2/2]
PD#SWPL-17670

Problem:
The vf structure is too large, causing the function to
exceed the stack size limit.

Solution:
Vf canvas configuration finishing.

Verify:
on U212

Change-Id: Id8b2c23001ae3c11d9c3824837cd1342c36dce25
Signed-off-by: renjiang.han <renjiang.han@amlogic.com>
2020-02-04 16:49:54 +09:00
renjiang.han
d45de899d5 ppmgr: canvas which ppmgr used has some conflict with decode side. [1/2]
PD#SWPL-17670

Problem:
canvas which ppmgr used has some conflict with decode side.

Solution:
Canvas is allocated dynamically.

Verify:
on U212

Change-Id: Ia265a70ec39005f8e8adc67be496308d6f6b87b7
Signed-off-by: renjiang.han <renjiang.han@amlogic.com>
2020-02-04 16:49:47 +09:00
Zongdong Jiao
947849829a hdmitx: add a fake hpd for system test [1/1]
PD#SWPL-16891

Problem:
For automatical test, the HDMI cable are always connected between Tx and Rx
without manully action.

Solution:
add a fake hpd for system test
echo 0[1] > /sys/class/amhdmitx/amhdmitx0/fake_plug

Verify:
G12/U212

Change-Id: I826fc0094845a13066a1535a4a87727b4ecad452
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2020-02-04 16:49:37 +09:00
Brian Zhu
9d40ac02c2 amvideo: need enable vd2 when dv dual layer playback [1/1]
PD#SWPL-17597

Problem:
When playing dual layer dv streaming, vd2 does not enable.

Solution:
Enable vd2 when dual layer dv streaming

Verify:
Verfied on u212

Change-Id: Iacbcfb7baec2344ab1e897b5e8af43cd9bb368c1
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2020-02-04 16:49:26 +09:00
Brian Zhu
c4bdacb1b3 amvideo: fix black screen issue when provide reset [1/1]
PD#SWPL-17497

Problem:
When decode resets before first frame coming, vpp will
disable video layer.

Solution:
Only switch the dispbuf_mapping after available frame toggled

Verify:
Verifed on u212

Change-Id: I798997ac9355efd0c477a7c9c59513c82110748f
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2020-02-04 16:49:16 +09:00
Pengcheng Chen
cb9997dac2 osd: update osd freescaler reg every hwc cmd [1/1]
PD#SWPL-17309

Problem:
do switch resolution test, sc regs miss-set caused display garbage

Solution:
update osd freescaler reg every hwc cmd

Verify:
ac214

Change-Id: I4c09094a477442b6f9f7bd782f9360d98eff299c
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2020-02-04 16:44:44 +09:00
qianqian.cai
e2b1cd2717 deintlace: disable di for s805x/y p mode [1/1]
PD#SWPL-16895

Problem:
Video output drop frame

Solution:
bypass DI s805x,s805y,p mode

Verify:
S805x

Change-Id: I675300c162124fcef01349efd881af6244e70c67
Signed-off-by: qianqian.cai <qianqian.cai@amlogic.com>
2020-02-04 16:44:03 +09:00
Zongdong Jiao
643216afd6 hdmitx: update edid attach after reading once [1/1]
PD#SWPL-17476

Problem:
After kernel boots up, there will no edid info for vinfo

Solution:
Need update edid attach after reading once
In kernel init, hdmitx / vout / edid with attach once time
Normal replug, plugin / edid / uevent / mode setting / attach
Also, init DRM_DB[0] data.

Verify:
G12/U212

Change-Id: I188f0972c882a17efcbc568ef7d0db861b9b6c0a
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2020-02-04 16:43:52 +09:00
Nan Li
61fb6bf299 sd: optimize sd_uart jtag pin cfg [1/1]
PD#SWPL-17140

Problem:
sd_uart jtag pin cfg error.

Solution:
modify sd_uart jtag pin dts cfgs.

Verify:
sm1

Change-Id: I66a2f147110e48d53bd2fa08ac3860426ffd1e7d
Signed-off-by: Nan Li <nan.li@amlogic.com>
2020-02-04 16:43:44 +09:00
Cao Jian
2938ec1029 dts: modify display_size_default for recovery buffer [4/4]
PD#SWPL-16902

Problem:
garbage screen for portrait panel in recovery mode

Solution:
modify display_size_default for recovery layout

Verify:
g12b-w400

Change-Id: Id42c8ed3ec824fdf00a598b25bde9c1f8383e532
Signed-off-by: Cao Jian <jian.cao@amlogic.com>
2020-02-04 16:31:54 +09:00
Cao Jian
db0d3810e3 osd: add canvas alignment for line length [1/4]
PD#SWPL-16902

Problem:
garbage screen for portrait panel in recovery mode

Solution:
add canvas alignment for line length
recovery takes it as framebuffer row_bytes

Verify:
g12b-w400

Change-Id: I9e94df3a7294fa3e388390e41eeb44e0588ec9d2
Signed-off-by: Cao Jian <jian.cao@amlogic.com>
2020-02-04 16:31:41 +09:00
Zhengrong.Zhu
b3705297a3 hdmitx: Playback HLG video color is abnormal during playing [1/1]
PD#SWPL-16374

Problem:
Playback HLG video color display is abnormal during playing

Solution:
Modify code related to color space.

Verify:
verify on the board of U212

Change-Id: Ie01ba1f9931a5e8f12bd1cfd70fd9ea752194f9b
Signed-off-by: Zhengrong Zhu <zhengrong.zhu@amlogic.com>
2020-02-04 16:31:33 +09:00
jian.zhou
a27e016c1c audio: disable spdifout play zero data function in driver [1/1]
PD#OTT-7246

Problem:
spdifout in platform probe function will cause pop sound
as we have done this at uboot stage

Solution:
disable spdifout play zero data function

Verify:
S905Y2-U221

Change-Id: I6885a200cdb909854e239bb172568ec0af503a06
Signed-off-by: jian.zhou <jian.zhou@amlogic.com>
2020-02-04 16:27:02 +09:00
Cheng Wang
7b0d2b8104 amvecm: Play part of the source lead to crash [1/1]
PD#SWPL-15906

Problem:
p212 g12a and so on no related register lead to crash.

Solution:
skip the function according chip ID.

Verify:
on P212

Change-Id: I5bcb17373365f8a07d5649a4405ea2468e103600
Signed-off-by: Cheng Wang <cheng.wang@amlogic.com>
2020-02-04 16:26:53 +09:00
Cao Jian
5f959c26f7 osd: modify register table update area [1/1]
PD#SWPL-16839

Problem:
display freezes and becomes slow/lags
while selecting PIP mode options in VLC app

Solution:
remove wait-vsync nearly vsync coming
use polling to avoid  long time waiting

Verify:
W400

Change-Id: I7498a68de3f6c45e0cd48aad2805f73a23adb7e6
Signed-off-by: Cao Jian <jian.cao@amlogic.com>
2020-02-04 16:26:46 +09:00
yao liu
f71527be08 DV: display black at smpte mode [2/2]
PD#SWPL-16027

Problem:
last_dst_format is wrong, it is DOVI even if on HDR TV

Solution:
Correct last_dst_format

Verify:
sm1

Change-Id: I77648ca989d3ff552cb4040d9f859d970eac7d98
Signed-off-by: yao liu <yao.liu@amlogic.com>
2020-02-04 16:22:38 +09:00
Cheng Wang
52f3fcc3c5 amvecm: fix SDR to HDR function has no effect [1/1]
PD#SWPL-16893

Problem:
The SDR to HDR function has no effect

Solution:
add sdr_mode changed judgement

Verify:
on P212

Change-Id: Ie3f03a51797f23866a6a6d1fb2c3c750741032f1
Signed-off-by: Cheng Wang <cheng.wang@amlogic.com>
2020-02-04 16:22:25 +09:00
Luan Yuan
76a12ae27c EMMC: default set HS200 instead of HS400. [1/1]
PD#SWPL-17426

Problem:
openlinux use HS200 instead of HS400.
it is more stability.

Solution:
openlinux use HS200 instead of HS400.

Verify:
verify by newton.

Change-Id: Iafea97a36b559c666eb440a4e7951b9fd3c64c5f
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2020-02-04 16:21:43 +09:00
Hong Guo
b6c07c0dc7 dvfs: update cpufreq tables for ac214 [1/1]
PD#SWPL-16915

Problem:
update cpufreq tables for ac214

Solution:
update cpufreq tables for ac214

Verify:
test pass on ac_214

Change-Id: I62941d8fe25d4e326fba06d1ba15a46ace3eff7c
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2020-02-04 16:17:37 +09:00
Zongdong Jiao
97b607d889 hdmitx: fix sda hold low issue [1/1]
PD#SWPL-8231

Problem:
When HDMI cable plugin, the SDA may hold low forever or for short time.

Solution:
Add sw_reset_flt reset to resolve hold low forever issue

Verify:
G12/Dongle

Change-Id: I53bbf704bb48a2cd3cc2ebef1444c69ad1623e87
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2020-02-04 13:50:39 +09:00
Luan Yuan
695cede0cc Amlogic: sync the code from mainline. [1/1]
PD#SWPL-17246

Problem:
sync the code from mainline.

Solution:
sync the code from mainline.

7c03859983c2 OSS vulnerability found in [boot.img]:[linux_kernel] (CVE-2018-12232) Risk:[] [1/1]
ba89a3d9c791 OSS vulnerability found in [boot.img]:[linux_kernel] (CVE-2019-8912) Risk:[] [1/1]
c434d0530610 Android Security Bulletin - November 2019-11 - Kernel components binder driver - CVE-2019-2214 [1/1]
ff8d9012fbd4 Android Security Bulletin - November 2019-11 - Kernel components ext4 filesystem - CVE-2019-11833 [1/1]
3c52e964495e cec: store msg after bootup from st [1/2]
94198a56ee10 lcd: support tcon vac and demura data [2/2]
1add1a008a03 vout: spi: porting lcd driver and SPI to Linux [1/1]
3e8d7b0e5f97 hdmirx: add hpd recovery logic when input clk is unstable [1/1]
f92e7ba21c62 ppmgr: Add 10bit, dolby and HDR video rotation. [1/1]
dab2cc37cd95 dvb: fix dmx2 interrupt bug [1/1]
9d31efae4a55 dv: add dv target output mode [1/1]
e86eb9d1b5c5 hdmirx: add rx phy tdr enable control [1/1]
8ea66f645bf6 dts: enable spi for gva [1/1]
baf6e74528ef drm: add drm support for tm2 [1/1]

Verify:
verify by newton

Change-Id: I9415060a4b39895b5d624117271a72fc6a1fd187
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2020-02-04 13:48:58 +09:00
Evoke Zhang
eef80c823b dts: g12a: panel: fix panel gpio config mistake [1/1]
PD#SWPL-16517

Problem:
g12a u200 panel gpio config is incorrect

Solution:
fix panel gpio config mistake

Verify:
u200

Change-Id: I6e20389a4ae356d9b44f7eefa224c7680d2e2c65
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2020-02-04 12:17:42 +09:00
renjiang.han
d9a14b5360 ppmgr: Add 10bit, dolby and HDR video rotation. [1/1]
PD#SWPL-16854

Problem:
10bit, dolby, and HDR video do not support rotation.

Solution:
Add 10bit, dolby and HDR video rotation.

Verify:
on w400

Change-Id: I8d61926939d7277f7030e0dab4ded59057b1c5e0
Signed-off-by: renjiang.han <renjiang.han@amlogic.com>
2020-02-04 12:17:42 +09:00
zhiyuan.zhu
2df4f5e9ec common: Join the code to the openlinux branch [1/5]
PD#SWPL-16484

Problem:
The DTVkit code is merged into the openlinux branch

Solution:
The DTVkit code is merged into the openlinux branch

Verify:
verify by newton

Change-Id: If7348733893f0518e68bd7d74593a78b510b88e2
Signed-off-by: zhiyuan.zhu <zhiyuan.zhu@amlogic.com>
2020-02-04 12:17:42 +09:00
zhiyuan.zhu
f453255de7 common: Join the code to the November branch [6/7]
PD#SWPL-16484

Problem:
The DTVkit code is merged into the November branch

Solution:
The DTVkit code is merged into the November branch

Verify:
verify by newton

Change-Id: If9b10321078083fc9dc402175c73bd2d79225029
Signed-off-by: zhiyuan.zhu <zhiyuan.zhu@amlogic.com>
2020-02-04 12:17:42 +09:00
Pengcheng Chen
88ccbf93c0 osd: add wait_hw_vsync_viu2 [1/1]
PD#TV-7584

Problem:
osd on viu2 present timeout

Solution:
add wait_hw_vsync_viu2

Verify:
Verified on X30A1-T962X2

Change-Id: Iab80f4cef830652923e1de73eba6d87715bad855
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2020-02-04 12:17:42 +09:00
shuanglong.wang
09a58616a1 tsync: tunnel mode do not set first vpts for stream mode [1/2]
PD#SWPL-11210

Problem:
stream mode set vpts in check in pts

Solution:
tunnel mode do not set first vpts for stream mode

Verify:
verify by u212

Change-Id: Ic369b83411051a819eb65ad5d1585e26e0342f3f
Signed-off-by: shuanglong.wang <shuanglong.wang@amlogic.com>
2020-02-04 12:17:42 +09:00
Luan Yuan
ad76f09655 dts: increase i2c3 clock frequency to 300k [2/2]
PD#SWPL-13393

Problem:
demod init cost about 8s

Solution:
increase i2c3 clock frequency

Verify:
on s905x3

Change-Id: Id8c7ec326b5cfccb5ec3ea4c286b95860527082a
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2020-02-04 12:17:42 +09:00
Shuai Li
a00af0b6ad audio: mclk pad0 doesn't output clk [1/1]
PD#OTT-5603

Problem:
Configurate GPIO_AO 9 as mclk_0,it doesn't work.

Solution:
From SM1, the mclk pad register is changed.
Using standard clk tree to make it compitable.

Verify:
TM2, SM1.

Change-Id: I8d53296297536c90768495232570f33fc89db131
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2020-02-04 12:17:42 +09:00
Gongwei Chen
bf922b332f dts: ac214 add tunner DVB-S2+ISDB-T:AV2018+CXD22856+R836 [1/3]
PD#SWPL-12874

Problem:
ac214 add tunner DVB-S2+ISDB-T:AV2018+CXD22856+R836

Solution:
ac214 add tunner DVB-S2+ISDB-T:AV2018+CXD22856+R836

Verify:
Verify by Android P ac214

Change-Id: If7cd5f35b12b44a2080ff0c9d1e3d90d5d3d96a9
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>
2020-02-04 12:17:42 +09:00
Gongwei Chen
6a8292f1f4 dts: add ac214 [1/2]
PD#SWPL-12710

Problem:
add ac214

Solution:
add ac214 dts

Verify:
Verify by Android P ac214

Change-Id: I24890bce6506331bdb9d8dbe21e5697c334ffc3c
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>

Conflicts:
	MAINTAINERS
2020-02-04 12:17:42 +09:00
Cheng Tong
5b6e5c597d dts: increase i2c3 clock frequency to 300k [2/2]
PD#SWPL-13393

Problem:
demod init cost about 8s

Solution:
increase i2c3 clock frequency

Verify:
on s905x3

Change-Id: I6e69629f088599f2e3b36f36d4da35df4d65034a
Signed-off-by: Cheng Tong <cheng.tong@amlogic.com>
2020-02-04 12:17:42 +09:00
Luan Yuan
2628cf24c7 dts: add support s805y config. [2/3]
PD#SWPL-16193

Problem:
add support s805y config.

Solution:
add support s805y config.

Verify:
verify by anning.

Change-Id: I2bbf2d72ca694e847078b3b4e3e439759840fcc3
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2020-02-04 12:17:42 +09:00
Tao Zeng
f35f013da4 mm: fix crash in vmap stack [1/1]
PD#SWPL-12145

Problem:
When switch IRQ stack, there is a 16 bytes miss match of irq
stack. This may cause context not match some times;

Solution:
Save sp to right place

Verify:
X301

Change-Id: I75dfa5208cb3cec050c1568ac78ae2e783ca106b
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2020-02-04 12:17:42 +09:00
Tao Zeng
256d948c1d kasan: fix pc crash if open kasan with vmap stack [1/1]
PD#SWPL-10141

Problem:
If open KASAN, connect wifi, and auto-start apk dianshijia, it will
soon crash as:
[ 56.655524@2] Unable to handle kernel NULL pointer dereference
               at virtual address 00000050
[ 56.658155@2] pgd = d0104000
[ 56.661008@2] [00000050] *pgd=00000000
[ 56.664744@2] Internal error: Oops: 80000005 1 PREEMPT SMP ARM
               common(O) firmware(O) media_clock(O) tb_detect(O)
               dnlp_alg ldim_alg mxl661_fe_32(O)
[ 56.709028@2] CPU: 2 PID: 4930 Comm: kworker/u9:3 Tainted: O 4.9.113 #1
[ 56.716908@2] Hardware name: Generic DT based system
[ 56.721858@2] task: f2632bc0 task.stack: c2010000
[ 56.726530@2] PC is at 0x50
[ 56.729301@2] LR is at 0x0

Solution:
Fix wrong pmd check address

Verify:
TL1 X301

Change-Id: I85e01418789801e0ef7691a9d8963c233e115b28
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2020-02-04 12:17:42 +09:00
Luke Go
0f0317ba0c android: media: osd: The zoom related problem fix.
- In android, zoom in/out feature cause osd's free scale adjust problem.
  So I separate the resolution table to adjust free scale mode.
  I Limited applying free scale handling logic from 1920x1200. The free
  scale handling will applied above 1920x1200 resolutions.

Change-Id: I00edf256ca9de16cb8fcbf987ee6dd75dec28a81
Signed-off-by: Luke Go <sangch.go@gmail.com>
2020-02-04 12:17:42 +09:00
Joy Cho
df6070a050 ODROID-N2: vout: hdmi: Add hpd control
Change-Id: Iebf0bf99dbdf7630dc972bba31a770fb1c7cd823
(cherry picked from commit ef4bb25aa5)
2020-02-04 12:17:42 +09:00
Chris KIM
22238af31a Revert "dts: add video11 and video12 for screencontrol [2/6]"
This reverts commit e7c5b28ea3.

Change-Id: I0a5856da1324b73998c81303c3996c702426b4dc
2020-02-03 17:37:27 +09:00
Joy Cho
8f241b68b6 media: osd: Limit android fb size to 1920x1080
On Android, higher framebuffer over 1920x1080
will be limited to 1920x1080 except 2560x1080
and osd driver needs to scale the size
to fit in actual hdmi output resolution.

Change-Id: I7ea24fb3f3d162b87a8a5b43af70d9ca7e5442fc
2020-02-03 17:37:27 +09:00
Joy Cho
464de8e282 media: osd: Adjust osd scaler setting to fix osd shift issue
Change-Id: I5987a49de58db8e40cd7a21475353ecde34512c1
2020-02-03 17:37:27 +09:00
Joy Cho
28a9e2e70c ODROID-N2: dts: Fix opp voltage values of cpu_opp_table
Change-Id: I07ef3ec6ae98e6e76ab920b043e57d5ad9f18616
2020-01-07 10:59:23 +09:00
Joy Cho
01703ed598 ODROID-N2: configs: Add AMLOGIC CPU frequency driver
Change-Id: I728ddc04040c686c5222c958b824a6673d5de21a
2020-01-07 10:59:23 +09:00
Joy Cho
770b747e76 cpufreq: meson-cpufreq: Fix errors
Change-Id: I8e17e8053451245d371006527f082a067af1439f
2020-01-07 10:59:23 +09:00
afl1
2650086cb3 sound/soc/auge: fix clock for DD+
Change-Id: Ibc3f7e27152f196440698a57bcef81506edc9ffb
2020-01-07 10:59:23 +09:00
afl1
6b4f23b79d sound/soc/auge: fix HD audio passthrough
Change-Id: Ied7699c596d97803f5d4e01749e514502e47b965
2020-01-07 10:59:23 +09:00