Commit Graph

190 Commits

Author SHA1 Message Date
Evoke Zhang 6211ddd39f vout: update frame rate measure function for s5 [1/1]
PD#SWPL-101967

Problem:
s5 vout vs measure regs changed

Solution:
update vout vs measure regs for s5

Verify:
ar301, ax201

Change-Id: I0534c78b094b17509f3343b7e23ed0524683c78f
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2022-12-02 15:12:13 +08:00
yuhua.lin c3bcbf5e4f video: t5m video bring up [1/1]
PD#SWPL-98156

Problem:
t5m video bring up

Solution:
complete it

Verify:
ptm

Change-Id: I77b77cba5f1a7a55b2ace37b166580affe995748
Signed-off-by: yuhua.lin <yuhua.lin@amlogic.com>
2022-12-02 15:12:13 +08:00
yuhua.lin 7401c0a463 osd: use reserved memory [1/1]
PD#SWPL-97910

Problem:
use reserved memory

Solution:
complete it

Verify:
t3

Signed-off-by: yuhua.lin <yuhua.lin@amlogic.com>
Change-Id: I1ce6861930bd80a5a439b723fcfb96e675be4b78
2022-12-02 15:05:56 +08:00
yufei.huan f070355da9 deinterlace: T3 Kernel 5.15 Android T Bringup - di [1/1]
PD#SWPL-97906

Problem:
T3 Kernel 5.15 Android T Bringup - di

Solution:
sync DI code

Verify:
smith

Change-Id: I590e2d71a453849d48207cccc3442e44da59c2da
Signed-off-by: yufei.huan <yufei.huan@amlogic.com>
2022-12-02 14:04:56 +08:00
Jie Dai a1c039d4d1 lcd: t5m lcd bringup [2/2]
PD#SWPL-98144

Problem:
t5m lcd need bringup

Solution:
add lcd related code for t5m

Verify:
ptm/pxp

Change-Id: I4d79cad87d37a1b15d9b790d87b3fbf83331c626
Signed-off-by: Jie Dai <jie.dai@amlogic.com>
2022-12-02 14:04:55 +08:00
Cheng Wang 1f07c5f621 frc: frc sync code for 5.15 [1/1]
PD#SWPL-97912

Problem:
sync memc code from k-5.4

Solution:
sync memc code from k-5.4

Verify:
ptm

Change-Id: I2ea7af1c7887912f99bffdbb1bbe344d59698800
Signed-off-by: Cheng Wang <cheng.wang@amlogic.com>
2022-12-02 14:04:55 +08:00
lizhi.hu 0cf8dd1a8d lcd: fix phy set coding style [1/1]
PD#SWPL-97537

Problem:
previous commit about phy set is ugly.

Solution:
replace with enum.

Verify:
t7c

Signed-off-by: lizhi.hu <lizhi.hu@amlogic.com>
Change-Id: I4fcba90fded92615741d5cc0f1b1c936257e4141
2022-12-02 14:04:55 +08:00
lizhi.hu 7144589547 lcd: fix phy not set [1/1]
PD#SWPL-97537

Problem:
lcd phy lane_lock not set when lcd probed in uboot,
result in ANA_CNTL19 set to 0 when lcd1&2 probe but conflict;
By the way, correct a few typo error.

Solution:
add lcd_phy_set() to lcd_phy_probe()

Verify:
t7c

Signed-off-by: lizhi.hu <lizhi.hu@amlogic.com>
Change-Id: I0c4889be119c3c222af81e46d8f304ef11c172c2
2022-12-02 14:04:54 +08:00
mingxiu.sun 0af3d219ab tvafe and vdin: sync code from branch t7t5m_1_20220908 [1/1]
PD#SWPL-95768

Problem:
kernel 5.15 missing patches

Solution:
sync code from kernel-5.4

Verify:
t7c_an400

Test:
compile ok

Change-Id: Ic9b0837775c537f93b37d3395a35144941437f09
Signed-off-by: mingxiu.sun <mingxiu.sun@amlogic.com>
2022-12-02 14:04:54 +08:00
Evoke Zhang f1a14db526 lcd_extern: add i2c_oled support [2/2]
PD#SWPL-95337

Problem:
need support oled i2c api

Solution:
lcd extern driver add i2c_oled support

Verify:
ar301

Change-Id: I57a966963cd0afa763d918fb27661ec96fc2e6d5
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2022-12-02 14:04:54 +08:00
Evoke Zhang 0f3eddfabf lcd: update vbyone reset control [1/1]
PD#SWPL-96923

Problem:
new chips reg addr error in vbyone sw reset function

Solution:
correct new chips reg addr for vbyone sw reset

Verify:
at301

Change-Id: Id065d419930a3a95b8219c048c0a009462508002
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2022-12-02 14:04:54 +08:00
lizhi.hu b70f01d422 lcd: port lcd code from k54 to k515 [1/1]
PD#SWPL-94863

Problem:
lcd code from k54 to k515

Solution:
port

Verify:
t7c

Signed-off-by: lizhi.hu <lizhi.hu@amlogic.com>
Change-Id: I6dddfd460795af45595f08f7fdd222533627f553
2022-12-02 14:04:53 +08:00
“xujin.hu” f2bd6a9c0d hdmirx: bring up t7c Hdmirx [1/1]
PD#SWPL-94137

Problem:
T7C Kerner5.15 Android T Bringup - HDMI RX

Solution:
port hdmirx of kernel5.4 to kernel5.15

Verify:
T7c

Change-Id: I1e6246a31a9973bf4b401b153fa7c018043cfdc4
Signed-off-by: “xujin.hu” <xujin.hu@amlogic.com>
2022-12-02 14:04:53 +08:00
qinglin.li a4da10d080 freertos: androidT bring up freertos with t7c [2/2]
PD#SWPL-94126

Problem:
bring up freertos with t7c

Solution:
bring up freertos with t7c

Verify:
t7c

Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
Change-Id: I49da1d2885baddf839f8229fe43dfd6f66055695
2022-12-02 14:04:53 +08:00
lizhi.hu 4a7d13ebe3 lcd: fix bug in lcd lcd_vsync_handler [1/1]
PD#SWPL-94121

Problem:
lcd_screen_restore and lcd_screen_black may be a nullptr,
under specific condition, results in kernel panic.

Solution:
remove pointer from pdrv.

Verify:
t7c

Signed-off-by: lizhi.hu <lizhi.hu@amlogic.com>
Change-Id: If3bd01a8426ca6b67052265e98ff8ab9829ed07d
2022-12-02 14:04:53 +08:00
jian zhou 8f2992fd87 audio: fix alsa driver typo [1/1]
PD#SWPL-103472

Problem:
alsa driver typo

Solution:
fix alsa driver typo

Verify:
T7C

Change-Id: I3c21521203d73cc0d658913662301ffa42a5bd18
Signed-off-by: jian zhou <jian.zhou@amlogic.com>
2022-12-01 22:51:22 -07:00
yuna.liu c4da0cd780 media_modules: CB2 tsplayer supports DV playback [1/1]
PD#SWPL-100780

Problem:
Requirement:modify the DV link when tsplayer plays.

Solution:
When tsplayer plays, amvideo in the DV link is changed to v4lvideo.*.

Verify:
ohm

Change-Id: I84dbe550308aceff8bd39c1dd331274439599153
Signed-off-by: yuna.liu <yuna.liu@amlogic.com>
2022-12-01 20:36:32 -07:00
qinglin.li 61c6f10791 dmc_monitor: add dmc dev access callback func [1/1]
PD#SWPL-102608

Problem:
add dmc dev access callback func

Solution:
add dmc access callback func
use see to https://confluence.amlogic.com/display/SW/06+DMC+Dev+Access

Verify:
sc2

Change-Id: I54faa5f383045b0441665af292a926cee52fca72
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2022-11-30 00:52:11 -07:00
qinglin.li e23e9bfc33 printk: use vendor_hook print cpu and irq info [2/3]
PD#SWPL-101578

Problem:
use vendor_hook print cpu and irq info

Solution:
use vendor_hook print cpu and irq info

Verify:
sc2

Change-Id: I52f0474ea55d4136933c0a2c12daf31eff4ab261
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2022-11-21 22:36:36 -07:00
hang cheng 9d4b1f31eb hdmitx: remove audio mute when adaptive from sdr to hdr [1/1]
PD#SWPL-99719

Problem:
when switch from SDR to HDR under adaptive
mode, audio will be mute for a few frames
cause nts detect audio drops

Solution:
remove audio mute when adaptive from sdr to hdr

Verify:
ah212

Test:
test on ah212, start play hdr movie

Change-Id: Ie09c09fa989a8c54f0a8ad688b8bc02ea51a9307
Signed-off-by: hang cheng <hang.cheng@amlogic.com>
2022-11-21 08:49:17 -07:00
zhentao.guo b23734648a media_module: Support SAR information offerring via interface [1/3]
PD#SWPL-93858

Problem:
According to mpeg spec,aspect ratio can be described as SAR or DAR.
Now decoder only offer DAR for mpeg2

Solution:
Offer DAR and SAR to the application, and tell which kind of aspect
ratio is offerred at the moment

Verify:
ohm

Change-Id: I5aca911eefac01017b16840f038ca5270a5e5a59
Signed-off-by: zhentao.guo <zhentao.guo@amlogic.com>
2022-11-17 21:17:32 -07:00
Brian Zhu 75ccd5538c di: add protection when copy long meta data [1/1]
PD#SWPL-99090

Problem:
When decode meta is too long, DI will skip it.

Solution:
Add protection to copy meta data

Verify:
Verified on sc2

Change-Id: Ia6ae379ec50a1f8f3f8a5549393835cb327bb39b
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2022-11-16 08:15:32 -07:00
Zongdong Jiao d427bba919 hdmitx: add hpd/ddc GPI status [1/1]
PD#SWPL-97568
PD#GH-3056
BUG=248516794

Problem:
Lack HPD/DDC GPI status info

Solution:
Add extra HPD/DDC GPI TIME stamps

Verify:
s4

Change-Id: I533dc8dda226f02b23130ae71cdc52b76311e317
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2022-11-15 06:13:59 -07:00
Jianxiong Pan 4e0cd2db13 mm: not export set_dump_dmc_reg() func. [1/1]
PD#SWPL-92714

Problem:
set_dump_dmc_reg func break gki.

Solution:
not export the func to ko.

Verify:
s4_ap222.

Change-Id: Id5c6aafad318084886bf1428b1fe44d5d091e44d
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2022-11-14 22:21:18 -07:00
Shuai Li 96fd78bb2f audio: add separate interface to control HDMITX src [3/3]
PD#SWPL-38929

Problem:
Currently, the HDMITX source is binding to SPDIF a/b.
we need separate interface to configure HDMITX audio
source from SPDIF a/b or TDM a/b/c for different
use case.

Solution:
1.add a new interface to control the HDMITX source.
2.add a new interface to config i2s to hdmitx format.

Verify:
Ohm

Change-Id: I82a04cfadeba19a9b54b77dd6a443b60dc2c9b39
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2022-11-14 22:21:14 -07:00
chuangcheng peng f9a7a52110 demux: sync kernel 5.4 to 5.15 [1/2]
PD#SWPL-100311

Problem:
sync kernel 5.4 to 5.15

Solution:
sync kernel 5.4 to 5.15

Verify:
not verified

Change-Id: I4d046cb9a54689ad53fbbc18bf8c16b3701d535f
Signed-off-by: chuangcheng peng <chuangcheng.peng@amlogic.com>
2022-11-09 06:15:41 -07:00
binqi zhang 6e5be361c0 uvm: add 10bit soft fbc feature [1/2]
PD#SWPL-93620

Problem:
implement truncate the 10bit data

Solution:
add 10bit fbc feature

Verify:
ohm

Change-Id: I97f507451b284836228b61716f06ee3cbf929452
Signed-off-by: binqi zhang <binqi.zhang@amlogic.com>
2022-11-08 06:04:24 -07:00
Wanwei Jiang 812361a4e9 pm: combine pm and reboot modules [1/1]
PD#SWPL-95684

Problem:
combine pm and reboot modules

Solution:
result: amlogic-pm.ko
original: amlogic-pm.ko amlogic-reboot.ko

Verify:
sc2

Change-Id: I25366f4413a7e7ec84131321e9b686b337358d70
Signed-off-by: Wanwei Jiang <wanwei.jiang@amlogic.com>
2022-11-05 12:06:33 +08:00
Wanwei Jiang 0b2a96838a Revert "debug: add filp_open debug function [2/3]"
PD#SWPL-95914

Problem:
it's break gki

Solution:
Use other method to implement, so revert old method
This reverts commit 073082327a.

Change-Id: I93e8a56d6e6a354f3d2dd27029913b5c79b797fc
Signed-off-by: Wanwei Jiang <wanwei.jiang@amlogic.com>
2022-11-05 12:06:11 +08:00
hang cheng 245c8ea296 hdmitx: adjust edid parsing for TV_TS [1/2]
PD#SWPL-97387

Problem:
TV_TS/2.4_R2 failed

Solution:
remove useless parsing code, and adjust
edid parsing and fallback policy
1.if edid checksum invalid in any block,
or header of cta extension block is 0,
then use fallback mode list
2.if base block header invalid, of
checksum invalid, then don't parse
base block except dtd / standard timing
3.for cta extension block, if block
byte0 != 0x2, it means not valid
extension block, skip parsing whole
block. if block byte1 <= 2, it means
that it's DVI block, skip parsing data
block, just parse DTD.
4.fallback mode list:
480p/720p/1080p60hz, RGB,8bit, and uplayer
should use 720p60hz RGB,8bit by default

Verify:
ah212

Test:
TV_TS/2.4_R2 tested pass, hdmi1.4/2.0 CTS no side effect

Change-Id: I9e24a16cd6d645f2e28f3238b2f20ace0b5090bb
Signed-off-by: hang cheng <hang.cheng@amlogic.com>
2022-11-03 19:55:11 -07:00
Wenjie Qiao fbd2325487 hdmitx: add new format 2560x1440p60hz [1/1]
PD#SWPL-91287

Problem:
lack format 2560x1440p60hz

Solution:
add new format 2560x1440p60hz

Verify:
sc2/g12a

Signed-off-by: Wenjie Qiao <wenjie.qiao@amlogic.com>
Change-Id: If7d1c24c39361b5ead9905b454dc5493a1e552a6
2022-11-01 23:29:16 -07:00
chen.xu 7fbd7dbc22 video_processor: Kernel 5.4 to Kernel 5.15 Bringup [1/1]
PD#SWPL-97096

Problem:
Kernel 5.4 to Kernel 5.15 Bringup

Solution:
sync video_processor code

Verify:
sc2

Signed-off-by: chen.xu <chen.xu@amlogic.com>
Change-Id: I05aae8fff3f4dbd37e05000b04f186e02fc4d7d0
2022-11-01 04:40:29 -07:00
Jian Cao cc868b2008 gdc: sync code from the lastest branch [1/1]
PD#SWPL-97096

Problem:
sync code changes from 5.4 to 5.15

Solution:
1. add the stride support in gdc_process_phys
2. add load/release firmware interface

Verify:
verified on t7-an400

Change-Id: I1e861f474c27be66f03cebd6d01d01582e763a0b
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
2022-11-01 02:12:23 -07:00
Jianxiong Pan f1fec716d4 mm: modify the watchpoint to ko. [2/2]
PD#SWPL-92714

Problem:
need modify the watchpoint to ko.

Solution:
modify the watchpoint to ko.

Verify:
sc2_ah212.

Change-Id: I26e5e451690fb557264d8bbd6bcceb7701494cc5
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2022-10-29 08:05:00 -07:00
Wenjie Qiao b060d61432 hdmitx: set mode vic=2/3 return valid mode 1 [1/1]
PD#SWPL-94658

Problem:
set mode 4x3, return valid mode 0, lead to no output

Solution:
when set mode 4x3 and 16x9, return valid mode 1

Verify:
sc2

Signed-off-by: Wenjie Qiao <wenjie.qiao@amlogic.com>
Change-Id: I8ae7466bd92c927a9953fbd2f22335862ad02b8f
2022-10-28 04:13:06 -07:00
qiang.liu b5f500b8c7 adc: print and debug state optimize [1/1]
PD#SWPL-94506

Problem:
adc default print too much

Solution:
print and debug state optimize

Verify:
t5w

Signed-off-by: qiang.liu <qiang.liu@amlogic.com>
Change-Id: Id383cc0bdd87619241a6ceb4421906fd39ec0974
2022-10-25 06:20:38 -07:00
xiang.wu1 da6bf92396 hdmitx: HDCP failure on resume, EDID read failed [1/1]
PD#SWPL-93674

Problem:
there's such case: plugin irq->hdmitx resume + read EDID +
resume uevent->mode setting + hdcp auth->plugin handler
read+ EDID,now EDID already read done and hdcp already
started, not read EDID again.

Solution:
not read EDID again if EDID already read done

Verify:
s905y4

Change-Id: I5241c7555f3e07c22b559b12273b4499c4ceb2c0
Signed-off-by: xiang.wu1 <xiang.wu1@amlogic.com>
2022-10-24 22:05:59 -07:00
qinglin.li a6e49c140c debug_file: optimize debugfile with poll [1/1]
PD#SWPL-94401

Problem:
repeat open file crash
read return error

Solution:
repeat open file wait file close
optimize read file poll

Verify:
sc2

Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
Change-Id: Iec70f2461d047f96ccbf80d9508c01ebb5092267
2022-10-24 00:25:58 -07:00
mingxiu.sun 6dbb171315 tvafe/vdin: Typo Check Failed Fix [1/1]
PD#SWPL-97153

Problem:
Typo Check Failed

Solution:
Modify error words

Verify:
typo check pass

Change-Id: Ic92023b5e48282723d3251573b57a057999745c4
Signed-off-by: mingxiu.sun <mingxiu.sun@amlogic.com>
2022-10-20 22:15:11 -07:00
Zongdong Jiao 08aa7f4d57 hdmitx: optimise the audio setting flow [1/1]
PD#SWPL-83336

Problem:
Need to optimise the audio setting flow

Solution:
Optimise the audio setting flow

Verify:
g12

Change-Id: Id2b65d233f3abc0baaa4c77f7369ae693ac93845
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2022-10-20 18:05:39 -07:00
Jianxiong Pan 2271989942 mm: pin locked file after fault. [2/2]
PD#SWPL-95400

Problem:
If we pin a file in android, the whole data of this file
will be loaded to DDR, but most of these data may not be
used, this caused memory waste.

Solution:
delay mark mlocked flags for unevictable pages until
it has been faulted.
You can use following command to disable this function:
echo 0 > /proc/sys/vm/shrink_unevictable

Verify:
sc2_ah212.

Change-Id: I3981b36114ab331c558198b80140aaa91fe7e7df
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2022-10-18 13:46:23 +08:00
Hanjie Lin 908c1c3c19 debug: fix iotrace break gki issue [2/3]
PD#SWPL-94447

Problem:
iotrace break gki10

Solution:
modify iotrace still builtin but not break gki10
also enabled DEBUG_PRINTK

Verify:
sc2

Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
Change-Id: Iffc6a21f28de871b7289ca671c2c226c40e9a66a
2022-10-15 03:28:18 -07:00
Hanjie Lin e6d82ef16c debug: fix gki10 break issue [2/3]
PD#SWPL-94447

Problem:
debug break gki10

Solution:
1, support amlogic_debug build to module, amlogic_debug module
   includes debug_lockup, cpu_mhz and meson_atrace for now.
2, amlogic_debug some function still build in kernel but not break
   gki10, for example: irq_check function on builtin kernel code,
   module_debug, workqueue debug etc.
3, new config CONFIG_AMLOGIC_HARDLOCKUP_DETECTOR still builtin but
   not break gki.
4, other functions for example iotrace still under developing

Verify:
sc2

Signed-off-by: Hanje Lin <hanjie.lin@amlogic.com>
Change-Id: I9c11465e3e879f999ae6fd13dc12c044efd2417a
2022-10-14 16:53:03 -07:00
sky zhou 483825b01b hdmitx_common: fix config cmd value error [1/1]
PD#SWPL-97326

Problem:
hw config cmd value should larger than CMD_CONF_OFFSET.

Solution:
enum part start from CMD_CONF_OFFSET + 0x2000 to follow
legacy define.

Verify:
verify on OHM

Test:
DRM-TX-18

Change-Id: Icd7aa397cbd6f6ec3a638f90b822c78fe4edf893
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
2022-10-14 04:08:11 -07:00
sky zhou 58607d7c8e hdmitx_common: refact read_phy_state function [1/1]
PD#SWPL-95465

Problem:
abstract read_phy_state for tx20&tx21

Solution:
move get_state to hdmitx_hw_common, and add read_phy_state
in get_state

Verify:
verify on OHM

Test:
DRM-TX-13

Change-Id: Ia1573cf63c4e42bdae2bfa8cd8e39ca156abbd99
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
2022-10-13 03:44:19 -07:00
Wenjie Qiao e452ec2c5b hdmitx: add hpd extcon [1/1]
PD#SWPL-87506

Problem:
lack extcon

Solution:
add extcon

Verify:
sc2

Change-Id: Iad1c509cf0616e719697670cab13a0501b17e846
Signed-off-by: Wenjie Qiao <wenjie.qiao@amlogic.com>
2022-10-13 02:04:43 -07:00
hai.cao db3d8ee5e0 vpp: add afd callback [1/1]
PD#SWPL-96745

Problem:
No afd callback in vpp

Solution:
Add afd callback in vpp

Verify:
t3

Change-Id: Ibe5a3fe27a8dee108efaa4ef2e6fb285dc03b4ce
Signed-off-by: hai.cao <hai.cao@amlogic.com>
2022-10-13 02:04:39 -07:00
Wenjie Qiao 8afd8d8207 hdmitx: 5.15 Expand the memory defined of physical size [1/1]
PD#SWPL-96666

Problem:
the edid physical size error

Solution:
Expand the memory defined of physical size

Verify:
sc2

Change-Id: I6f6d4884ee71c0801df30849fe37374494faddd5
Signed-off-by: Wenjie Qiao <wenjie.qiao@amlogic.com>
2022-10-12 18:48:32 -07:00
sky zhou 833791fbb7 hdmitx_common: share set_content_type for tx20&tx21 [1/1]
PD#SWPL-95126

Problem:
share set_content_type function for tx20&tx21.

Solution:
move cntlconfig to common hw api and implement
set_content_type drm api and sysfs.

Verify:
verify on OHM.

Test:
DRM-TX-15

Change-Id: Ie06229130175cc0b02d2816db48c9f8884777f2d
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
2022-10-12 02:07:34 -07:00
sky zhou dccba28921 hdmitx_common: share setphy/avmute function for tx20/tx21 [1/1]
PD#SWPL-95125

Problem:
share setphy/avmute function for tx20/tx21.

Solution:
move cntlmisc to common hw api and implement
setphy/avmute drm api and sysfs.

Verify:
verify on ohm.

Test:
DRM-TX-13,DRM-TX-14

Change-Id: Id231252241e30be2d88d4789b77b392c9cf10abb
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
2022-10-08 07:47:14 -07:00