Commit Graph

649315 Commits

Author SHA1 Message Date
Chris
b64cf4e711 Merge "Revert "Revert "dts: add video11 and video12 for screencontrol [2/6]""" into odroidg12-4.9.y-android 2020-06-11 17:54:28 +09:00
Chris
11713f2000 Merge "dv: fix first frame garbage with dual dv [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:54:19 +09:00
Chris
e32b7e748f Merge "dv: do not use internal chip_id function by other modules [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:54:13 +09:00
Chris
92ca8a5281 Merge "hdmitx: The logo is displayed twice during the restart process [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:54:07 +09:00
Chris
f4e237a563 Merge "ion: fix deadlock in ion driver [1/2]" into odroidg12-4.9.y-android 2020-06-11 17:54:00 +09:00
Chris
bc92884ee6 Merge "ion: fix race condition in ion driver [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:53:54 +09:00
Chris
8994529afc Merge "tsync_pcr: need to set firstvpts when video start. [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:53:48 +09:00
Chris
5883f8287d Merge "avsync: Use the video start pts to init pcr [3/3]" into odroidg12-4.9.y-android 2020-06-11 17:53:41 +09:00
Chris
91304b265a Merge "usb: usb C port bad recognition rate more than 3%. [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:45:02 +09:00
Chris
58e7ec04c3 Merge "display: add force output mode feature [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:44:49 +09:00
Chris
d71e2d11b4 Merge "ppmgr: fix omx freeze when reset [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:44:43 +09:00
Chris
d5699b2ed4 Merge "hdmitx: fix mismatch between dv_cap and dv_cap2 [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:44:36 +09:00
Chris
3748f8b42f Merge "hdmitx: add the real sysfs 'dv_cap2' for hdr_priority [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:44:27 +09:00
Chris
025d8ea1f3 Merge "avsync: Use first_vpts to init pcr when audio in invalid [1/2]" into odroidg12-4.9.y-android 2020-06-11 17:44:20 +09:00
Chris
92a91dc39c Merge "hdmitx: don't ignore hotplug out event [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:44:13 +09:00
Chris
9640674c0c Merge "osd: osd rdma recovery table init err [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:44:06 +09:00
Chris
50681c0161 Merge "hdr: fix non-standard hdr video type identify [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:43:58 +09:00
Chris
9068f84ab4 Merge "memtrack: add EGL cached mem counting on AndroidP [3/3]" into odroidg12-4.9.y-android 2020-06-11 17:43:51 +09:00
Chris
35136bd113 Merge "dts: unable to wake up lcd after sleep, lcd io is used by other mode [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:43:44 +09:00
Chris
5d5533e0e3 Merge "demod: optimize the loading of demod and tuner [1/3]" into odroidg12-4.9.y-android 2020-06-11 17:43:37 +09:00
Chris
0e664bce6a Merge "ppmgr: free_q len is 0 when dec reset [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:43:29 +09:00
Chris
813bb8a2b3 Merge "audio: don't reset spdifout in prepare [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:43:23 +09:00
Chris
8213383074 Merge "di: fix subtile wrong effect [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:43:16 +09:00
Chris
46a8ed382c Merge "hdmitx: null pointer in hdmitx_set_vsif_pkt when driver early suspend [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:43:09 +09:00
Chris
61b7dd1e47 Merge "hdmitx: Please add the debug info of hdmitx : hdmitx [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:43:00 +09:00
Chris
71fea9315a Merge "vpp: fix the vd1 path select error with wrong condition [1/1]" into odroidg12-4.9.y-android 2020-06-11 17:42:53 +09:00
Hyeonki Hong
900da3cb7f ODROID-COMMON: arm64/dts: modify i2c alias bus number
Change-Id: I94d1bc2f56bac1af6c7b45ab1b9bf8cbf50407c1
(cherry picked from commit 842d3137e6)
2020-06-03 13:42:13 +09:00
Chris KIM
3d007e4026 Revert "Revert "dts: add video11 and video12 for screencontrol [2/6]""
This reverts commit 22238af31a.

Change-Id: I7f1fa91c80a5536f04a6622ee049a4b840fee09e
2020-06-01 16:02:16 +09:00
Brian Zhu
29de6b3a91 dv: fix first frame garbage with dual dv [1/1]
PD#SWPL-19310

Problem:
When playing dual layer dv streaming, first frame
may display green. BL layer is out of sync with EL
layer.

Solution:
Fix the case which will toggle one more EL vframe incorrecly.

Verify:
Verified by AC214

Change-Id: I13b4a05716e800b8d25564a82d1d34d7198bf467
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
(cherry picked from commit d3b7a081f3b744a7a24a84bbf74865445651d4b4)
2020-06-01 15:21:24 +09:00
Brian Zhu
2f0ae64d27 dv: do not use internal chip_id function by other modules [1/1]
PD#SWPL-18367

Problem:
amcsc used the wrong chip_id function from dolby vision driver,
but at the time, the dv driver maybe did not probe. So got the
wrong chip id state.

Solution:
Using the common chip id function.

Verify:
Verifed by u212

Change-Id: If27e861a2c8d8a586448f33cbaa70a81cbe2370f
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2020-06-01 15:20:46 +09:00
Zhengrong.Zhu
4eb0070cba hdmitx: The logo is displayed twice during the restart process [1/1]
PD#SWPL-20447

Problem:
The logo is displayed twice during the restart process

Solution:
Modify the codes used to update the status of HPD during the restart.

Verify:
verify on the board of U212

Change-Id: I05786b0668991eb4c161529d04b0333493475d8c
Signed-off-by: Zhengrong Zhu <zhengrong.zhu@amlogic.com>
2020-05-29 13:55:11 +09:00
binqi zhang
8ab56d3b55 ion: fix deadlock in ion driver [1/2]
PD#SWPL-17365

Problem:
There exits deadlock between ion_client_destroy
and ion_debug_heap_show.
ion_client_destroy will take debugfs_mutex and then
call debugfs_remove_recursive, which will wait for
the finish of debugfs_srcu's GP.
sys_read will enter debugfs_srcu'critical section,
then ion_debug_heap_show will try to get debugfs_mutex.
At last, deadlock occurs.

Solution:
change mutex_unlock place in ion_client_destroy,
don't let the mutex lock synchronize_srcu.

Verify:
autoreboot test on tl1

Change-Id: I7008a6bf21421ab08d84754ae52d0840e53900c9
Signed-off-by: binqi zhang <binqi.zhang@amlogic.com>
2020-05-29 13:55:00 +09:00
binqi zhang
21fb83cc12 ion: fix race condition in ion driver [1/1]
PD#SWPL-17365

Problem:
There are race condition between ion_client_destroy
and ion_debug_heap_show after adding memtrack function

Solution:
move debugfs_mutex to protect the ion_debug_heap_show

Verify:
autoreboot test on tl1

Change-Id: Ife30539426a003946db464bb7349746d991c6f36
Signed-off-by: binqi zhang <binqi.zhang@amlogic.com>
2020-05-29 13:54:51 +09:00
chen.chen1
b6ce15c859 tsync_pcr: need to set firstvpts when video start. [1/1]
PD#SWPL-21624

Problem:
audio hal can't get firstvpts.

Solution:
set firstvpts when video start.

Verify:
verified on S905X3-AC214

Change-Id: I22134ae58fbc89bb0748adcfc4b07718c192f8e9
Signed-off-by: Chen Chen <chen.chen1@amlogic.com>
2020-05-29 13:54:40 +09:00
Zhizhong Zhang
0433ac1c70 avsync: Use the video start pts to init pcr [3/3]
PD#SWPL-21670

Problem:
Play from beginning,it will get stuck for a while

Solution:
Use the video start pts to init pcr if audio invalid

Verify:
Verified ok on patch-build

Change-Id: I0673d811889cb6b9ae3301355f09b268725d472d
Signed-off-by: Zhizhong Zhang <zhizhong.zhang@amlogic.com>
2020-05-29 13:54:30 +09:00
he.he
1bcba5d6ee usb: usb C port bad recognition rate more than 3%. [1/1]
PD#SWPL-21646

Problem:
usb C port bad recognition rate more than 3%.

Solution:
Using new PHY (that starting at TL1) parameters
that is different from the old PHY (g12a).

Verify:
test pass on tl1

Change-Id: I41885936645a90658318883b8556312814430633
Signed-off-by: he.he <he.he@amlogic.com>
2020-05-29 13:54:07 +09:00
robin.zhu
5ce04261b0 display: add force output mode feature [1/1]
PD#SWPL-21941

Problem:
Feature request:
  need convert all video format to sdr
  and output as sdr

Solution:
add force output mode feature for DV and CSC

For force output as SDR:
When policy == follow_sink(0) or force_mode(2)
echo 1 > /sys/module/am_vecm/parameters/force_output
mode:
	BT709 = 1(SDR),
	BT2020,
	BT2020_PQ(HDR10),
	BT2020_PQ_DYNAMIC(HDR10+),
	BT2020_HLG,
	BT2100_IPT(DV)

Verify:
none

Change-Id: If892be6c2a02a690fd6b8ef1a0b3e1db815c6595
Signed-off-by: robin.zhu <robin.zhu@amlogic.com>
2020-05-29 13:49:13 +09:00
jintao xu
11de5ce674 ppmgr: fix omx freeze when reset [1/1]
PD#SWPL-20851

Problem:
omx can not set omx pts after reset

Solution:
set omx pts after reset

Verify:
U212

Change-Id: I582e5696f14b50bb774e18ef8295af5b4f121501
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
2020-05-29 13:48:52 +09:00
Zongdong Jiao
c6ef9b6d95 hdmitx: fix mismatch between dv_cap and dv_cap2 [1/1]
PD#SWPL-21292

Problem:
There are mismatched information between dv_cap and dv_cap2

Solution:
Fix mismatch between dv_cap and dv_cap2

Verify:
G12

Change-Id: I147e5fe65e65d362259c66ae29ee14c63440ef97
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2020-05-29 13:46:11 +09:00
Zongdong Jiao
3f3d33b8fd hdmitx: add the real sysfs 'dv_cap2' for hdr_priority [1/1]
PD#SWPL-20074

Problem:
When the variable hdr_priority is true, the original 'dv_cap'
will be masked, and systemcontrol can't get the value under
'HDR Priority/HDR10'.

Solution:
Add the sysfs 'dv_cap2' no matter what's the 'hdr_priority'.

Verify:
G12

Change-Id: Ia45e4016c1ce4fa17e5102509195afda95a20804
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2020-05-29 13:46:03 +09:00
Zhizhong Zhang
f6665c4bc3 avsync: Use first_vpts to init pcr when audio in invalid [1/2]
PD#SWPL-21670

Problem:
Play from beginning will stuck

Solution:
Use first_vpts to init pcr instead of the invalid audio pts
Merge the SWPL-18995,SWPL-20085,SWPL-21122,SWPL-21117 patch

Verify:
Verified ok on patch-build

Signed-off-by: Zhizhong Zhang <zhizhong.zhang@amlogic.com>
Change-Id: I1bbd3a94b0c17f104eeb67c8f8ba528f2a37fdf4
2020-05-29 13:42:40 +09:00
Hang Cheng
cb2a73acbf hdmitx: don't ignore hotplug out event [1/1]
PD#SWPL-21288

Problem:
if there's a short hpd low pulse(eg 10ms, plugout->plugin event),
the plugout event will be ignored in driver, and the subsequent plugin
event can't be handled by systemcontrol because systemcontrol can't
get the later plugin uevent when successive plugin uevent come.
But hdcp is disabled in driver, video will be mute after systemcontrol
detect hdcp auth status fail.

Solution:
don't ignore any hpd low pluse

Verify:
G12

Change-Id: I9b6a43c1f5cab5649b6dc011543f44601e96d4cb
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
2020-05-29 13:41:43 +09:00
Pengcheng Chen
46dbc1ffc8 osd: osd rdma recovery table init err [1/1]
PD#SWPL-21602

Problem:
some osd rdma regs not recovery success

Solution:
osd rdma recovery table init correctly

Verify:
verify by u212, tl1

Change-Id: I77915704c007639338bfc76ffa46f1bd8839afbd
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2020-05-29 13:38:58 +09:00
MingLiang Dong
71c72b445b hdr: fix non-standard hdr video type identify [1/1]
PD#SWPL-19812

Problem:
play non-standard hdr video, color is abnormal

Solution:
because video transfer characteristic is not SPMTE2084,
process as sdr video

Verify:
verify on SM1

Change-Id: Idc2d364917bf10ac9d1fb4a32962c629e22486f0
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2020-05-29 13:29:58 +09:00
binqi zhang
a0ea4a2e66 memtrack: add EGL cached mem counting on AndroidP [3/3]
PD#SWPL-16844

Problem:
Lost ram caused by ion_page_pool_alloc

Solution:
count ion cached memory in other mtrack

Verify:
adb shell dumpsys meminfo
Confirm EGL entries

Change-Id: I43c1e7fdf9313db08e72d0ff77e4a6215d77cceb
Signed-off-by: binqi zhang <binqi.zhang@amlogic.com>
2020-05-29 13:21:50 +09:00
shaochan.liu
1d10f5c5dd dts: unable to wake up lcd after sleep, lcd io is used by other mode [1/1]
PD#SWPL-16900

Problem:
unable to wake up lcd after sleep, lcd io is used by other mode

Solution:
1,disable the mode and use the io for lcd

Verify:
axg s400

Change-Id: Ib2146f62a7dc8830eb46e8f0194f478abeab7cdf
Signed-off-by: shaochan.liu <shaochan.liu@amlogic.com>
2020-05-29 12:27:17 +09:00
nengwen.chen
2ceac4ec08 demod: optimize the loading of demod and tuner [1/3]
PD#SWPL-20095

Problem:
1.optimize the loading of demod and tuner.

Solution:
1.optimize the loading of demod and tuner.
2.DVB uniformly calls the attach interface to load demod or tuner.
3.Demod and Tuner internal structure is independent of DVB structure.
4.All demod and tuner configuration parameters are passed on attach.

Verify:
Verified by x301 and ac214.

Change-Id: If5f485cebeadb7ec54cf5b10ef1424065c13b388
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2020-05-29 12:27:08 +09:00
jintao xu
866b8bd2a5 ppmgr: free_q len is 0 when dec reset [1/1]
PD#SWPL-20253

Problem:
free_q len is 0 when dec reset

Solution:
reset free_q after reg

Verify:
U212

Change-Id: Icfb5e36cb13198bece0710aeafae6f02d3d26f7d
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
2020-05-29 12:26:47 +09:00
Shuai Li
579fd63a27 audio: don't reset spdifout in prepare [1/1]
PD#SWPL-17916

Problem:
Reset spdifout will cause the spdif signal
stop a while and some AVR will spend 2s
to resync the spdif clk.

Solution:
As the chip after TL1 the audio FIFO changes to async
FIFO which may bring in channel map error.
In the case 2 channel playback, don't reset spdifout.

Verify:
SM1.

Change-Id: I65dbfe63251b4fbf468fbbcfbd07b2625708c8b6
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2020-05-29 12:24:02 +09:00
Xihai Zhu
d306b71e93 di: fix subtile wrong effect [1/1]
PD#SWPL-15375

Problem:
subtitle weave error at the beginning

Solution:
finetune para for "di: fix pulldown 32 enter issue
from vlsi-LiuYanling [1/1]"

Verify:
tl1

Change-Id: I5929f50fd139797c25b9d4049acc9fdf04643534
Signed-off-by: Xihai Zhu <xihai.zhu@amlogic.com>
2020-05-29 12:22:37 +09:00