Commit Graph

5205 Commits

Author SHA1 Message Date
Wenjie Qiao 42e2bbadd3 hdmitx: mute/unmute will send error audio sample when HBR mode [1/1]
PD#SWPL-170716

Problem:
s7d/s7 mute/unmute will send error audio sample when HBR mode

Solution:
dont contrl AUD_EN bit1 when mute/unmute

Verify:
s7d

Test:
DRM-TX-109

Change-Id: Ic27fd32c39409e43388a91de2127a3bbeeed1257
Signed-off-by: Wenjie Qiao <wenjie.qiao@amlogic.com>
2024-06-02 19:10:14 +08:00
zongdong.jiao 775e2320f2 hdmitx: around tmp_rate as 6000 or 120000 [1/1]
PD#SWPL-171499

Problem:
When setting QMS/BRR, the 60hz is 59.94 with default
frac_rate_policy is true

Solution:
Around tmp_rate as 6000 or 120000

Verify:
s7d/bm201

Test:
DRM-TX-38

Change-Id: I988da95b40db0723b10cad5687572d2870867288
Signed-off-by: zongdong.jiao <zongdong.jiao@amlogic.com>
2024-06-02 19:10:14 +08:00
jian zhou d18b54543c audio: fix s4d pdm crash when start capture data [1/1]
PD#SWPL-171153

Problem:
s4d pdm crash when start capture data

Solution:
enable dclk after set rate by the hw and vlsi suggest

Verify:
s4d-oppen

Change-Id: Ic7f0252e28adfb28ad1e0ad8c63a3d64ada4341c
Signed-off-by: jian zhou <jian.zhou@amlogic.com>
2024-06-02 19:10:14 +08:00
Tao Zeng fec8367f95 amfc: fix kasan report [1/1]
PD#SWPL-171396

Problem:
kasan report:
BUG: KASAN: slab-out-of-bounds in amfc_decompress+0x144/0x14bc [amlogic_amfc]
write of size 32 at addr ffffff8011d68780 by task init/1

 CPU: 3 PID: 1 Comm: init Tainted: P B OE 5.15.137-android14-11-maybe-dirty #1
 Hardware name: s7d_s905x5m_bm201 (DT)
 Call trace:
 dump_backtrace+0x144/0x190
 show_stack+0x2c/0x48
 dump_stack_lvl+0x7c/0x94
 print_report+0x178/0x4a0
 kasan_report+0xb0/0x104
 kasan_check_range+0x274/0x2b4
 memset+0x58/0x88
 amfc_decompress+0x144/0x14bc [amlogic_amfc]
 amfc_crypto_decompress+0x68/0xd8 [amlogic_amfc]

Solution:
fix it

Verify:
local

Change-Id: I84df77652100ba1d43169feedef057d13cf34656
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2024-06-02 19:10:14 +08:00
qing.zhang 0c5b10f214 audio: resample num error [1/1]
PD#SWPL-169776

Problem:
chip info num is not meeting with the real used resample numble.
resample check error when resample B is disabled.
dts only enable resample A, when check resample number, the
resample attach module will error. For example, chip info numble set to
2;when resample A and B all are enabled, the attach module will be 8
for hdmi in and 7 for loopback A; if disable  resample B, the attach
module will be 8 and 0. once tinycap tdmin with to->src = 0, the toddr
bit 27 will be enable, which control the no use bit and cause toddr
hangup

Solution:
1. fix check resample number

Verify:
ross

Change-Id: I3198449de7bd731e888a33da7f740409b37f6fbb
Signed-off-by: qing.zhang <qing.zhang@amlogic.com>
2024-05-30 15:19:32 +08:00
changpeng.jiang e130e6d3e2 S7: pm: enable pm [1/1]
PD#SWPL-170696

Problem:
enable pm node

Solution:
enable pm node

Verify:
s7_bh201

Change-Id: Ied89c5fe6b58e53af14cf613e7c50a8c6d82e525
Signed-off-by: changpeng Jiang <changpeng.jiang@amlogic.com>
2024-05-29 20:36:49 +08:00
Jianxiong Pan 665c720304 dts: set the default cma pool size to 4M. [1/1]
PD#SWPL-170753

Problem:
reduce cma size.

Solution:
set the default cma size from 8M to 4M.

Verify:
local.

Change-Id: Ib031a1411ae8378fea5f46fbfe621cfcbaff8da2
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2024-05-29 18:54:01 +08:00
Luan Yuan e9b81f2725 mdns: mdns wakeup [1/1]
PD#SWPL-169202

Problem:
google cast wakeup

Solution:
add mdns wakeup source

Verify:
ross.

Change-Id: I88d19a9a89e47bfe9e1366b37a3cf8ce7a42f4ef
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2024-05-28 20:17:41 +08:00
Huijuan Xiao c5f24c8d0e hdr: hdr core before osd blend [1/1]
PD#SWPL-165938

Problem:
move rgb2yuv from hdr core to osd csc.

Solution:
move rgb2yuv from hdr core to osd csc.

Verify:
s7d

Change-Id: Ib52d37f9f9a72dad048ce3ed2512ed1208d1538f
Signed-off-by: Huijuan Xiao <huijuan.xiao@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2024-05-28 20:17:41 +08:00
Long c6def0ad44 eMMC: enable inline crypto. [1/1]
PD#SWPL-168577

Problem:
need enable inlinecrypt

Solution:
enable inlinecrypt function

Verify:
S7,S7D

Change-Id: Ia7b5781ecfc1d5ec99ca1158e687033dcf9581be
Signed-off-by: Long <long.yu@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2024-05-28 20:17:41 +08:00
Ao Xu d672a57147 drm: adjust s7d color format definition [1/1]
PD#SWPL-170861

Problem:
s7d RGB565 format register value changed from 4 to 2

Solution:
adjust s7d color format definition

Verify:
s7d

Test:
DRM-OSD-7

Change-Id: I8d1ef7195152b4742aecb3242228831f81e932ff
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2024-05-28 20:17:40 +08:00
Huqiang Qin 16611dd645 adc_keypad: support adc keypad [1/1]
PD#SWPL-170469

Problem:
Need ADC Keypad.

Solution:
Copy the adc_keypad node from BH201.

Verify:
Build pass

Change-Id: Ief466e00dec6bba3086764afc75e77a3c1c382c2
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2024-05-27 22:39:28 +08:00
Long a80f07d3cb eMMC: enable inline crypto. [1/1]
PD#SWPL-168577

Problem:
need enable inlinecrypt

Solution:
enable inlinecrypt function

Verify:
S7,S7D

Change-Id: Idd072bf0e9f7155ba13cd4f34c28010dad7d0773
Signed-off-by: Long <long.yu@amlogic.com>
2024-05-25 18:08:52 +08:00
Jian Cao f51e53f088 vpp: check process speed using BRR duration in QMS situation [1/1]
PD#SWPL-170526

Problem:
after switching the QMS TV resolution from 4K60 to 1080p60hz
the display is abnormal

Solution:
BRR should be used to calculate processing speed

Verify:
s7d

Change-Id: I28a4fcac660b62b450c5b897fe51bef662f190cf
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
2024-05-24 22:02:51 +08:00
Pengcheng Chen d5cf604441 vpp: adjust v/hskip calc for 4k2k120hz [1/1]
PD#SWPL-156135

Problem:
vd2 v/hskip error for 4k2k120hz

Solution:
1. sync_duration_num calc depend on frc_enable with vd1
2. for t3x need do skip for under 5% scaler down

Verify:
t3x

Change-Id: Iad3ccd6e8cbcecd4703e9c0d76ae53fbcbf1d3cd
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2024-05-24 22:02:38 +08:00
Pengcheng Chen 8e0bd15b4f vpp: fix vd1 slice1 pps out calc error [1/1]
PD#SWPL-155382

Problem:
vd1 slice1 pps out calc error when dv is on

Solution:
1. used dv out to calc vd1 slice1 pps out
2. add frc is on logica to calcl vskip/hskip

Verify:
t3x

Change-Id: I97a81e6cb810f54f829c3d618f25ad63d6b4e536
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2024-05-24 22:02:12 +08:00
zongdong.jiao 41246d4410 hdmitx: add brr_duration in vinfo struct [1/1]
PD#SWPL-170855

Problem:
When QMS is enabled, the BRR may 120hz. When switches to lower rate,
video player will run under lower rate and display abnormal.

Solution:
Add brr_duration and video still run BRR rate to avoid abnormal display.

Verify:
s7

Test:
DRM-TX-38

Change-Id: I03f3588f89648145ae06b66fe4db4bb9701559b3
Signed-off-by: zongdong.jiao <zongdong.jiao@amlogic.com>
2024-05-24 21:48:17 +08:00
yao liu 4ebee010d0 amdv: flash blank during boot up [1/1]
PD#SWPL-170786

Problem:
flash blank during boot up

Solution:
get dolby_status from uboot,
to check if ll mode

Verify:
s7d

Change-Id: I2c055f79188011447cdf7a9a56745d6362ae0dcd
Signed-off-by: yao liu <yao.liu@amlogic.com>
2024-05-24 21:44:07 +08:00
Luan Yuan 1af2395491 eMMC: add sg-link descriptors for crypto. [1/1]
PD#SWPL-168640

Problem:
disable cap-mmc-crypto.

Solution:
disable cap-mmc-crypto.

Verify:
S7

Change-Id: I2c1f904feb7fab2413b2b2b0ec3d61559517057f
Signed-off-by: Long <long.yu@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2024-05-24 17:41:54 +08:00
Long 19ae6f1b63 eMMC: add sg-link descriptors for crypto. [1/1]
PD#SWPL-168640

Problem:
The old descriptor chain will cause dun to not be updated.

Solution:
add sg-link descriptors.

Verify:
S7

Change-Id: I50ccca0f441c4df4945a350cfdf9779497d9bba5
Signed-off-by: Long <long.yu@amlogic.com>
2024-05-24 14:19:06 +08:00
Ao Xu e07dd9414a drm: send qms packet when mode change between mode group [1/1]
PD#SWPL-169783

Problem:
when mode change between group, drm will set mode to brr.
set_vframe_rate_hint will not be called, then qms packet
will not be sended.

Solution:
send qms packet when mode change between mode group

Verify:
s7d

Test:
DRM-OSD-45

Change-Id: I0b02827406d268392a2909ab1817110fd72dd674
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2024-05-23 22:13:33 +08:00
yiting.deng 3d4063e5b1 clk: clean scmi related config [1/1]
PD#SWPL-170472

Problem:
scmi macro configuration is improper. For 64-bit only
need to configure CONFIG_COMMON_CLK_SCMI and for 32-bit
need to configure CONFIG_ARM_SCMI_PROTOCOL=y to
a32_base_defconfig

Solution:
fix it

Verify:
s7

Change-Id: I2cd9750fc59a85b1fba1b561569400c812e2cd3d
Signed-off-by: yiting.deng <yiting.deng@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2024-05-23 21:59:20 +08:00
xiang.wu1 3035aba03f hdmitx21: Small mode switch color conversion error [1/1]
PD#SWPL-170058

Problem:
Small mode switching color conversion error, display abnormality

Solution:
1、optimization VPU_HDMI_SETTING、VPU_FMT_CTRL、
VPU_HDMI_DITH reg config
2、fix color conversion error

Verify:
S7D

Test:
DRM-TX-79,DRM-TX-80,DRM-TX-81,DRM-TX-82、DRM-TX-118

Change-Id: I72aaac3e9de13737f0d7078fa0d96797b2c3ee41
Signed-off-by: xiang.wu1 <xiang.wu1@amlogic.com>
2024-05-23 21:47:09 +08:00
yao liu 6fb287deaf amdv: flash when start playing [1/1]
PD#SWPL-169755

Problem:
core1 turn on one vsync delay

Solution:
Modify incorrect conditions

Verify:
s7d

Change-Id: I36c1ef680558ba9cbf59eacb91a85639198d8283
Signed-off-by: yao liu <yao.liu@amlogic.com>
2024-05-23 15:09:55 +08:00
Jian Cao 528ccf819e vpp: correct p2i h and v sizes [1/1]
PD#SWPL-170074

Problem:
704x576 video source shows garbage under 576cvbs

Solution:
1. correct h and v sizes
2. force update of vpp post h and v sizes during resume

Verify:
s7d

Change-Id: Iec0a38809cc6976a276e17b71186a423cd512399
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
2024-05-23 14:34:25 +08:00
qiyao.zhou dfeb303695 di: video stretch downwards on starting [1/1]
PD#SWPL-170069

Problem:
crop param would been modify by di.

Solution:
Modify crop param setting flow in di.

Verify:
t5d

Change-Id: If3f61769454d54e1ef7d28655039c027547b9545
Signed-off-by: qiyao.zhou <qiyao.zhou@amlogic.com>
2024-05-23 13:40:09 +08:00
dian.shao bbc4c188ac usb: phy reset [1/1]
PD#SWPL-163063

Problem:
usb phy reset

Solution:
change bit

Verify:
s7d

Change-Id: I2033d6bf9592fd9a18800fe14221d06b263116a8
Signed-off-by: dian.shao <dian.shao@amlogic.com>
2024-05-23 13:40:09 +08:00
dian.shao 52f4beae48 usb: s7d phy pll update [1/1]
PD#SWPL-163063

Problem:
s7d phy eye diagram.

Solution:
off:0x50 val update

Verify:
bm201

Change-Id: I9f5a1e5233175f666a45e76c1a65709bc5bb12f6
Signed-off-by: dian.shao <dian.shao@amlogic.com>
2024-05-23 13:40:09 +08:00
jinbing.zhu 7b4c011f00 hdr: modify cgain coef1 reg [1/1]
PD#SWPL-170182

Problem:
modify cgain coef1 reg

Solution:
modify cgain coef1 reg

Verify:
s7d

Change-Id: I436a242e1e783809b26d1286223f131dff7356a6
Signed-off-by: jinbing.zhu <jinbing.zhu@amlogic.com>
2024-05-23 12:35:22 +08:00
Qianggui Song 0aaf37e740 pinctrl: sc2: fix gpioa_14/15 wrong ds offset [1/1]
PD#SWPL-170383

Problem:
GPIOA_14/15 DS register bit is wrong.

Solution:
Fix it

Verify:
sc2

Change-Id: Idf5fd1642259ef2dfcb5baec828b64717ade3f7e
Signed-off-by: Qianggui Song <qianggui.song@amlogic.com>
2024-05-23 12:35:22 +08:00
jiebing chen 277483343a audio: hifi1_pll already unprepared appears pressure test autosuspend [1/1]
PD#SWPL-156792

Problem:
hifipll already disable when disable spdif clk, there are some warning

Solution:
need depend on hifipll enable when disable spdif clk

Verify:
t3x

Change-Id: I6b9c53135fe1715c9606a82c2627659f3347a198
Signed-off-by: jiebing chen <jiebing.chen@amlogic.com>
2024-05-22 17:24:19 +08:00
qing.zhang 6e105b5ed8 audio: loopback channel sync issue [1/1]
PD#SWPL-169715

Problem:
1. loopback channel sync error, when loopback data in source is
disabled, the loopback channel sync original channel sync
must not be set.

Solution:
1. when only use loopback lb source, disable the original channel sync

Verify:
Ross Ref201

Change-Id: I116f7d5d28e5eb25c7ca2d63f03986d0ff3fa951
Signed-off-by: qing.zhang <qing.zhang@amlogic.com>
2024-05-22 16:52:04 +08:00
Long 3df67efa9b eMMC: fix gp0 frequence as 1152mhz. [1/1]
PD#SWPL-167218

Problem:
fix gp0 frequence as 1152mhz

Solution:
fix source clock as 1152mhz

Verify:
s5

Change-Id: I6fc671bdc2f95881c55eb955c80073d3c1ead853
Signed-off-by: Long <long.yu@amlogic.com>
2024-05-21 22:41:51 +08:00
yao liu acf46a8330 amdv: osd dv core is disabled [1/1]
PD#SWPL-160834
PD#SWPL-170230

Problem:
osd dv core is disabled

Solution:
add dv support for s7d in vpp

Verify:
s7d

Change-Id: I6373667f99f8ddc3fc06e23f4d1831d6d4b4e40d
Signed-off-by: yao liu <yao.liu@amlogic.com>
2024-05-21 20:32:02 +08:00
xiangyang.yan 55924c6e3e eth: avoid stmmac_suspend() reentry [1/1]
PD#SWPL-168910

Problem:
avoid stmmac_suspend() reentry

Solution:
avoid stmmac_suspend() reentry

Verify:
A311D2-AN400(rev_C)#280

Change-Id: I3f1032675d47f61c7819de1335adea619fca5f2a
Signed-off-by: xiangyang.yan <xiangyang.yan@amlogic.com>
2024-05-21 19:06:40 +08:00
xiangyang.yan f45c2c7d29 eth: apply std pm [1/1]
PD#SWPL-165425

Problem:
apply std pm

Solution:
apply std pm

Verify:
A311D2-AN400(rev_C)#280

Change-Id: I5edc22b0bb78dfcd20c82451de21d5e441d78dd9
Signed-off-by: xiangyang.yan <xiangyang.yan@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2024-05-21 19:06:33 +08:00
Yue Wang 5fb5b7a855 t5m: usb: fix usb bus resume timeout [1/1]
PD#SWPL-170131

Problem:
T5m usb bus resume timeout.

Solution:
fix usb bus resume timeout.

Verify:
T903D4

Change-Id: Id0deb5af437d70a294424b2033deb7b846947e52
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2024-05-21 17:38:46 +08:00
Yu Tu e59201ab10 dtsi: s7d uart_a for BT [1/1]
PD#SWPL-170338

Problem:
BT play has caton imagination

Solution:
uart interrupt thread

Verify:
s7d_bm201

Change-Id: Ie8acab3ab88db84b9e7f6e3cab691b7f91b40098
Signed-off-by: Yu Tu <yu.tu@amlogic.com>
2024-05-21 16:22:30 +08:00
Luan Yuan 8985d89193 s805x3: disable dvb demux. [1/2]
PD#SWPL-170399

Problem:
s805x3 no need dtvkit default.
enable it if the project requires that.

Solution:
disable it.

Verify:
verify by pascal.

Change-Id: Ifb418367ed0c56fd506a00d3ee57c22d7d1f3e70
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2024-05-21 15:39:10 +08:00
Tao Zeng c58c35df8a amfc: using source code for zstd tools [1/1]
PD#SWPL-169230

Problem:
Previous commit https://scgit.amlogic.com/#/c/427562/ including a
close source binary for zstd compress, which have license problems

Solution:
1, remove this binary in auto-patch;
2, add source code for this binary

Verify:
S7D

Change-Id: Ic0355b6ad3d0d91a9772d007fa2c9797f18004b1
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2024-05-21 14:20:06 +08:00
yajing.li fb0b604efe uvm: fix video play issue on linux [1/1]
PD#SWPL-154064

Problem:
video play fail on linux.
regression of the follow cl:
https://scgit.amlogic.com/#/c/374332

Solution:
uvm alloc by gem only have one sgt.
add map check condition.

Verify:
Roku

Change-Id: I923152156e3446e3264f92576e7a30517d7cfbe3
Signed-off-by: yajing.li <yajing.li@amlogic.com>
2024-05-21 10:31:02 +08:00
haiyang.ren 8c9ae87f3d audio: DUT HDMI OUT silent [1/2]
PD#SWPL-166928

Problem:
1. The device tree configuration is incomplete;
2. The HDMI Source configuration is incorrect;

Solution:
1. Add related configuration;
2. Corrective source configuration

Verify:
S7_BH201

Change-Id: Id0d2555519c31438c8909efb6e669a15d223040e
Signed-off-by: haiyang.ren <haiyang.ren@amlogic.com>
2024-05-20 21:24:48 +08:00
honghai.song ad466da590 DTS: change T5D device alloc range to 0x30000000 [1/1]
PD#SWPL-145364

Problem:
T5D dts device alloc range blow 0x30000000

Solution:
change T5D device alloc range to 0x30000000

Verify:
on T5D

Change-Id: I8941509563766fa398a22ff9beb83a604f8459e7
Signed-off-by: honghai.song <honghai.song@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2024-05-20 20:27:30 +08:00
yao zhang1 fc22ecdc20 dts: s7_s905y5_bh201 yocto bringup. [1/1]
PD#SWPL-167295

Problem:
Bringup s7_s905y5_bh201.

Solution:
Bringup s7_s905y5_bh201.

Verify:
s7_s905y5_bh201

Change-Id: I6d6759fcd04d2464851c5d086582b1e965f42d40
Signed-off-by: yao zhang1 <yao.zhang1@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2024-05-20 20:26:02 +08:00
Jian Cao 6fa766187d rdma: print the task name of the rdma handle [1/1]
PD#SWPL-169288

Problem:
add print to debug issues operating rdma simultaneously.

Solution:
add this debug method

Verify:
s5

Change-Id: If3d2b4b949874e79ea3c73335715a2cd0782940a
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
2024-05-20 20:19:42 +08:00
Jian Cao dd2381f2f4 vpp: avoid rdma write over vsync [1/1]
PD#SWPL-158630

Problem:
enc line number is not correct under mode 1080i

Solution:
1. avoid rdma write over vsync
2. fix 1080i over vsync calc

Verify:
s1a

Change-Id: I10fba2e443e1e1c3167560ed6e3cd014247c4efc
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
2024-05-20 20:19:42 +08:00
qiyao.zhou f4e9fa6d2a vc: Add debug info in vc. [1/1]
PD#SWPL-151899

Problem:
Require VC debug info to match player and vpp.

Solution:
Add debug info in VC.

Verify:
t3x

Change-Id: I1840f214c579484f1966914b10898b9cd4169acb
Signed-off-by: qiyao.zhou <qiyao.zhou@amlogic.com>
2024-05-20 04:57:16 -07:00
Jian Cao 28225025c4 vpp: dump current display buffer information [1/1]
PD#SWPL-161054

Problem:
vpp add log to print final display with timestamp and buffer address

Solution:
add this support

Verify:
t3x

Change-Id: I4df8f1fd1495291919e34942d3b2e4b6cb679713
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
2024-05-20 19:52:13 +08:00
jialong.jiang 9f4ae3dcac amdv: 1080p120 display abnormal. [1/1]
PD#SWPL-168716

Problem:
sink-led black screen,
source-led split screen.

Solution:
modify g_vpotch

Verify:
s7d

Change-Id: I615f38a78c7cdbfe25bb05ddf76e1333c227b032
Signed-off-by: jialong.jiang <jialong.jiang@amlogic.com>
2024-05-20 19:48:08 +08:00
rong.wang 82618db164 deinterlace: add api to get input param for vpp [1/1]
PD#SWPL-160157

Problem:
add api to get input param for vpp when pre-link

Solution:
add api to get input param for vpp

Verify:
t5m

Change-Id: I5f1198c94dfc840f5024d1fdb61bda2f5c5e8f4e
Signed-off-by: rong.wang <rong.wang@amlogic.com>
2024-05-20 19:11:42 +08:00