Commit Graph

6502 Commits

Author SHA1 Message Date
hai.cao 64dfcef174 vpp: video will balck when width scaler down to 1 pixel [1/1]
PD#SWPL-227069

Problem:
video will balck when width scaler down to 1 pixel

Solution:
setting 1 pixel can display

Verify:
t7c

Change-Id: Idfb75c1c96d8d69070b80d3bee6113199e11ada7
Signed-off-by: hai.cao <hai.cao@amlogic.com>
2025-08-21 19:39:59 -07:00
Qianggui Song 42b738b5ec defconfig: txhd2 cts failed for HID_PLAYSTATION [1/1]
PD#SWPL-226680

Problem:
cts test failed

Solution:
Enable HID_PLAYSTATION and relative config.

Verify:
TXHD2

Change-Id: I4c87922068405405de65dd68521c1a97e0e36af4
Signed-off-by: Qianggui Song <qianggui.song@amlogic.com>
2025-08-21 19:39:49 -07:00
hai.cao 03b073ed82 vpp: sync vpp code from5.15 [1/1]
PD#SWPL-226876

Problem:
sync 5.15 code

Solution:
sync 5.15 code

Verify:
s7d

Change-Id: Ie7ec3a3b9c0ab9451e0783e29623c38ff34873e1
Signed-off-by: hai.cao <hai.cao@amlogic.com>
2025-08-21 19:39:43 -07:00
Doosan Baek 5fea227724 kl/kt: t6w kl/kt bring-up [1/1]
PD#SWPL-188954

Problem:
t6w kl/kt bring-up

Solution:
t6w kl/kt dts bring-up

Verify:
t6w

Change-Id: I65e6e567e0124335926d5e21ff1cff2684387e38
Signed-off-by: Doosan Baek <doosan.baek@amlogic.com>
2025-08-21 19:39:36 -07:00
Doosan Baek fc72a77dd3 kt: add key flag command [1/1]
PD#SWPL-189327

Problem:
need key flag info

Solution:
add key flag command

Verify:
s6

Change-Id: If77ae46dfba7c696c1e6093b977d694f7fb2cd97
Signed-off-by: Doosan Baek <doosan.baek@amlogic.com>
(cherry picked from commit aee0ed53b6)
2025-08-21 19:39:31 -07:00
Doosan Baek 809837677b kl/kt: add mid extra function [1/1]
PD#SWPL-187016

Problem:
need mid_extra
need tdes kt capability
need m2m_any kl capability

Solution:
add mid extra mode
add tdes kt capability
add m2m_any kl capability

Verify:
s6

Change-Id: I1f49890b61bf70110596c036c970d895388317c1
Signed-off-by: Doosan Baek <doosan.baek@amlogic.com>
(cherry picked from commit 29fe9c3b05)
2025-08-21 19:39:24 -07:00
Doosan Baek 22c0bd142f kt: fix aml_kt_get_status [1/1]
PD#SWPL-161936

Problem:
The 'kt_ret' bits in 'KT_REE_CFG' must not be checked
because the 'kt_ret' bits have an invalid value
without performing the keytable configuration.

Solution:
remove the routine checking kt_ret in aml_kt_get_status.

Verify:
SC2

Change-Id: Ifa3b82c3fa620e1cdc8da6c62da075305045acad
Signed-off-by: Doosan Baek <doosan.baek@amlogic.com>
(cherry picked from commit dabf12f7b3)
2025-08-21 19:39:19 -07:00
Doosan Baek fb26a7369a KL: add etsi challenge-response function [1/1]
PD#SWPL-149012

Problem:
KL driver should be able to check
if KL's fuse is okay without M2M or descrambler in REE.

Solution:
add etsi challenge-response function

Verify:
T5D

Change-Id: I8492896086ba3e6e4701ee4511794e803ed6d900
Signed-off-by: Doosan Baek <doosan.baek@amlogic.com>
(cherry picked from commit d7d4979d9d)
2025-08-21 19:39:11 -07:00
Doosan Baek 3ce4cb147f KT: fix return error aml_kt_invalidate for IV [1/1]
PD#SWPL-148195

Problem:
In the case of IV, aml_kt_invalidate does not have a return value,
resulting in an error return value.

Solution:
In the case of IV, aml_kt_invalidate is not performed,
so the return value is always successful.

Verify:
S4D metacas

Change-Id: I4fe59ce4f1d94486dbf3a00e72f611db3bc7b4f4
Signed-off-by: Doosan Baek <doosan.baek@amlogic.com>
(cherry picked from commit 9aa414bc72)
2025-08-21 19:39:05 -07:00
jian zhou 092639eca8 audio: fix vad kfree crash [1/1]
PD#SWPL-228676
PD#TV-167499

Problem:
kfree+0x94/0x38c
vad_deinit+0xf4/0x1b4 [amlogic_snd_soc]
vad_set_enable_enum+0x8c/0x11c [amlogic_snd_soc]
snd_ctl_elem_write+0x184/0x2ac
snd_ctl_ioctl_compat+0x1a4/0x398
root cause: vmalloc buffer use kfree.

Solution:
use vfree for vmalloc buffer.

Verify:
t5m

Change-Id: I7ce7bd2d2474c527ec9fe927b861b0637b6cd7a4
Signed-off-by: jian zhou <jian.zhou@amlogic.com>
2025-08-21 19:32:59 -07:00
Xiangyu Cai 44c2c587c1 frame_lock: sync code [1/1]
PD#SWPL-226563

Problem:
sync code

Solution:
fix code

Verify:
t5m

Change-Id: Id8fec606a4cf7dadbe4df7295769f3bb659fc235
Signed-off-by: Xiangyu Cai <xiangyu.cai@amlogic.com>
2025-08-21 19:32:42 -07:00
Huqiang Qin d44268f7d9 saradc: t6w: support saradc [1/1]
PD#SWPL-207503

Problem:
T6W Silicon Bringup.

Solution:
Support SAR ADC.

Verify:
T6W/BS311

Change-Id: Ibd493e2e2739785ad5b725fae261187fa7c1880a
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2025-08-21 19:32:14 -07:00
Huqiang Qin 9c0c101f93 wdt: t6w: support watchdog [1/1]
PD#SWPL-208331

Problem:
T6W Silicon Bringup.

Solution:
Support watchdog.

Verify:
T6W/BS311

Change-Id: Icf19f09f2eb1fce3ce64ce37626587b61cce4ff0
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
(cherry picked from commit 2adc466bbd7adffc421c4b16ab0ef0123a2501f2)
2025-08-21 19:32:08 -07:00
Huqiang Qin 8034cbf120 keypad: support hibernate [1/1]
PD#SWPL-145761

Problem:
Kernel 5.15 STD for keypad.

Solution:
1. suspend/resume changed to standard pm interface.
2. re-request GPIO on restore.

Verify:
S5/AX208 T7/AN400

Change-Id: I71a1dde2f3a436f480ea9c728a010b8705d8e976
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
(cherry picked from commit 6b08567df2)
(cherry picked from commit 525573beeb31a0ff7a4b6dca59cebbbfb97107d7)
2025-08-21 19:32:03 -07:00
Huqiang Qin 54a732d543 saradc: t6d: Voltage units adjusted to millivolts [1/1]
PD#SWPL-196630

Problem:
Need to simulate SARADC pin as GPIO.

Solution:
Voltage units adjusted to millivolts.

Verify:
T6D/BR301

Change-Id: I43ff3fd0c97e5d6381e42aee7d02f6b7bf5d7ea5
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2025-08-21 19:31:58 -07:00
Huqiang Qin b6e85a2da3 adc_keypad: optimize code to reduce invalid calls to mbox [1/1]
PD#SWPL-167411

Problem:
Optimize code to reduce invalid calls to mbox.

Solution:
Only the old version of bl30 (arm core) needs to configure mbox.

Verify:
SC2/AH212

Change-Id: Ib8781930453fe8fadffd39b73c477750857dd86a
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2025-08-21 19:31:52 -07:00
Xingxing Wang d6b18c5f07 thermal: rise sensor suspend/resume log print level [1/1]
PD#SWPL-158984

Problem:
tsensor suspend/resume time long

Solution:
remove warn log

Verify:
t3x

Change-Id: I801214be6b6d2934db3c98e1e38e762274976b89
Signed-off-by: Xingxing Wang <xingxing.wang@amlogic.com>
2025-08-21 19:30:28 -07:00
Ao Xu 5f655f981c drm: add get osd status callback [1/1]
PD#SWPL-226593

Problem:
amvecm and dv need get osd status

Solution:
add get osd status callback

Verify:
s7/s7d/s6/t6d

Test:
DRM-OSD-84

Change-Id: If34418241f821bf34c7d999c33a31df28eb6d911
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2025-08-21 19:29:39 -07:00
Liming Xue 32a62cf946 kernel6.12: add dsp reset function [6/6]
PD#SWPL-222902

Problem:
dsp need to reset when dsp hang

Solution:
add reset function when dsp panic

Verify:
a5

Change-Id: I3203af2530026098d929c32558abafcf328a17d5
Signed-off-by: Liming Xue <liming.xue@amlogic.com>
2025-08-21 18:47:30 -07:00
dian.shao 4816ccf253 usb: cleanup s6 dts dead nodes [1/1]
PD#SWPL-226877

Problem:
s6 dts usb dead nodes.

Solution:
Delete them.

Verify:
s905x5m.

Change-Id: Ie7851fbb118e13301cbc155dc5b44c516b9cda69
Signed-off-by: dian.shao <dian.shao@amlogic.com>
2025-08-21 03:19:58 -07:00
dian.shao 4fe50bd959 usb: crg udc vmap leaks [1/1]
PD#SWPL-185878

Problem:
vmap allocation fail.

Solution:
Don't use devm_ioremap.
Release in remove.

Verify:
t950s

Change-Id: Ie3bd5a842b00f238f0f045f0441349e8556c1155
Signed-off-by: dian.shao <dian.shao@amlogic.com>
2025-08-21 03:19:53 -07:00
Huqiang Qin 4c3877c8a4 wdt: fix coverity [1/1]
PD#SWPL-217775

Problem:
Potentially overflowing expression around operator [ * ],
which is evaluated using 4 byte arithmetic, and then used
in a context that expects an expression of 8 bytes type.

Solution:
Change long to int.

Verify:
SC2/AH212

Change-Id: I7a1118d21a0e14379a66c4970f2f93ae2740e649
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
(cherry picked from commit 7598a49c8381144da11c07bf1ee3cbbb03ae943b)
2025-08-21 01:41:55 -07:00
Jianxiong Pan 623502fb52 mm: sync memory related patches from 5.15. [1/1]
PD#SWPL-225609

Problem:
sync memory related patches from 5.15.

Solution:
sync memory related patches from 5.15.

Verify:
local;

Change-Id: I010fa5dc436d486bc46b7d49f8e0b32057c05ac7
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2025-08-20 09:08:02 -07:00
Jianxiong Pan 5f078a79ba vmap: setup vmap stack for hibernate. [1/1]
PD#SWPL-225609

Problem:
system crash when suspend in hibernate.

Solution:
setup vmap stack for hibernate.

Verify:
s7.

Change-Id: I971c9a3dec8092a49e9531367e99f53775785a3e
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2025-08-20 09:07:44 -07:00
dian.shao 074ce64404 usb: don't set max burst to 0 for all controllers [1/1]
PD#SWPL-178337

Problem:
In commit I11c0a1588c9a8d7db3987ef7b6444d836fe35cb3,
the max burst of bulk ep of all uvc devices are set
to 0.

Solution:
Do this only for crg host.

Verify:
s905x5m.

Change-Id: I1f716d5b42e88ee5f6be1fc24473bc7dd89f0fe7
Signed-off-by: dian.shao <dian.shao@amlogic.com>
2025-08-20 09:07:34 -07:00
Pengcheng Chen a8662e5aa2 vpp: fix vd2 presclaer setting error [1/1]
PD#SWPL-227632

Problem:
vd2 presclaer enable, sometimes display not full

Solution:
fix vd2 presclaer setting error

Verify:
s7d

Change-Id: Ie432116fbac9edb0a8b16da04fb081502ab640c1
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
(cherry picked from commit 75cf071f3045ebe79f25d1dcae31d1700e209b94)
2025-08-20 09:07:27 -07:00
chuangcheng.peng 47762b8e00 demux: add get dmx new pts debug print & pts handle [1/1]
PD#SWPL-227405

Problem:
get dmx pts jump for secure AV

Solution:
get newest pts for secure AV

Verify:
verified at SC2

Change-Id: I107131724db01440ee17a666f90b5a33564fcf3b
Signed-off-by: chuangcheng.peng <chuangcheng.peng@amlogic.com>
2025-08-20 09:07:21 -07:00
chuangcheng.peng a1de7c081a demux: get dvr ts quickly [1/1]
PD#SWPL-225792

Problem:
get dvr ts slow

Solution:
adjust the dvr timer flush time to 3ms

Verify:
verified at T5M

Change-Id: Ied0f2fa1366afc0088858e63174fd379540cbf52
Signed-off-by: chuangcheng.peng <chuangcheng.peng@amlogic.com>
2025-08-20 09:07:15 -07:00
lizhi.hu 42c423017c eDPTX: fix resume link training [1/1]
PD#SWPL-226583

Problem:
link training failed when resume

Solution:
fix

Verify:
t7_an400

Change-Id: I28898fad70eddf190201f00a4eddaf27bb077720
Signed-off-by: lizhi.hu <lizhi.hu@amlogic.com>
2025-08-20 09:06:54 -07:00
Qiang Guo cc5a9b21e5 uvm: sync lcevc code from kernel 5.15 [1/1]
PD#SWPL-223330

Problem:
sync missing lcevc code from kernel 5.15.

Solution:
sync missing lcevc code from kernel 5.15.
1. https://scgit.amlogic.com/#/c/454323/
2. https://scgit.amlogic.com/#/c/541715/

Verify:
Android 16 Raman

Change-Id: Id1c7b59f99e138045fe6355317795a2caa34e5f1
Signed-off-by: Qiang Guo <qiang.guo@amlogic.com>
2025-08-20 09:06:49 -07:00
wenlong.zhang 69c5e20947 drm: add new pipeline to support osd1 scaler move to local [1/1]
PD#SWPL-224597

Problem:
if scaler1 after osdblend, the scaler1 input in yuv domain is non-0 when
raw data alpha is 0, and then vpp_osd_sc_div_alpha is enabled, the osd
capture will get the green screen

Solution:
add new pipeline to support osd1 scaler move to local, the scaler1 will
work on rgb domain

Verify:
s7d

Test:
DRM-OSD-96

Change-Id: Ic383199f131a838ab9f27c8aed68df20447c21e1
Signed-off-by: wenlong.zhang <wenlong.zhang@amlogic.com>
2025-08-20 09:06:40 -07:00
gerrit autosubmit 2c1da0f92b Merge "drm: enable scaler premulti/divide alpha feature [1/1]" into amlogic-6.12-dev 2025-08-20 09:06:32 -07:00
Pengcheng Chen b60d74ff80 vpp: disable lcevc when vskip >= 1 [1/1]
PD#SWPL-206246

Problem:
disable lcevc when vskip >= 1

Solution:
disable lcevc when vskip >= 1

Verify:
s7d

Change-Id: I1746116d3f2a668211af7b0be566abe158ede3c1
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2025-08-20 09:06:21 -07:00
hui.liu 36f46b164c audio: Supported format for Audio HAL Format is missing. [1/1]
PD#SWPL-225635

Problem:
1.The Audio HAL Format in the driver is missing several
display formats.

Solution:
1.The audio_hal_format is consistent with audio_hal.
All formats can be displayed normally through tinymix
contents.

Verify:
yocto

Change-Id: Idee4cdf477d557bee871dabc8ddd0d7dee18dfbd
Signed-off-by: hui.liu <hui.liu@amlogic.com>
(cherry picked from commit 5551284e6f09be07c3cd4bce5d46b114e1a28848)
2025-08-20 02:27:36 -07:00
Huqiang Qin be62f47d84 eth: disable power/clk when no wakeup source [1/1]
PD#SWPL-179512

Problem:
Need to save power when there is no wakeup source.

Solution:
Disable power/clk when no wakeup source.

Verify:
S7D/BM201

Change-Id: I57d7df4079b734c52738777d2f2999743fc6bc3d
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
(cherry picked from commit bae0c9bb857be17735e4b10aa46862e07423d0bd)
2025-08-20 02:16:36 -07:00
hongyu.chen1 6829910ee5 hwspinlock: coverity issue. [1/1]
PD#SWPL-228405

Problem:
The variable has not been initialized.

Solution:
add init.

Verify:
coverity scan

Change-Id: I2b3c5d920fee8b6bb70ddb1f23c75e5a4128d9be
Signed-off-by: hongyu.chen1 <hongyu.chen1@amlogic.com>
(cherry picked from commit 1130cbe2c74ef475a69129653fff15d73b0c7095)
2025-08-20 02:16:24 -07:00
brian.zhu c70624e495 di: add new interface for di_reverse setting [1/1]
PD#SWPL-227215

Problem:
need new interface to set di_reverse

Solution:
Add it

Verify:
Verified on txhd2

Change-Id: I99cb6d7a65d6ca920dcf34e1bfd6111ecc65b74b
Signed-off-by: brian.zhu <brian.zhu@amlogic.com>
2025-08-20 02:16:02 -07:00
zijie.hong 6ead8d9210 vdin: v4l2 hdmi camera do not afbc [1/1]
PD#SWPL-226501

Problem:
afbc addr is null then DMC violation

Solution:
v4l2 hdmi camera do not afbc

Verify:
T7C

Change-Id: I05bcee9aa0d4d597e7da36ba18f34947c57c0644
Signed-off-by: zijie.hong <zijie.hong@amlogic.com>
2025-08-20 02:15:35 -07:00
ruofei.zhao 627db8a179 hdmitx: t7 check the deep color phase [2/2]
PD#SWPL-227399

Problem:
check the deep color phase may make time out

Solution:
enable phy to dig before poll reg
keep the tmds clk and pixel clk

Verify:
t7c

Test:
DRM-TX-135

Change-Id: Id432ef89b13126a96e611382c2382891db82bb7c
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2025-08-20 02:15:26 -07:00
Evoke Zhang e4d3f53736 lcd: add frame change debug test support [1/1]
PD#SWPL-224872

Problem:
need support frame change test for debug

Solution:
add frame change debug test support

Verify:
ay301

Change-Id: I1e0d9f1707a4aa9eba8ac28b3d4da7d012956cee
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2025-08-20 02:13:14 -07:00
Shuai Li 82422d6423 audio: fix ad82128 frequence response issue [1/1]
PD#SWPL-224440

Problem:
Dolby Cert sample rate support test fail.
After reset, register default samplerate config is not 48k
which damage the frequence response.

Solution:
Correct the AD82128 codec sample rate according to user config.

Verify:
X5M SBR

Change-Id: I5069855acb9b7784e9f734127399d455ffe035c7
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2025-08-19 21:04:10 -07:00
zijie.hong 7748a784aa vdin: vdin dump yuv444/422 buffer error [1/1]
PD#SWPL-227967

Problem:
vdin dump yuv444/422 buffer error

Solution:
total_size error

Verify:
T5W/T5M/T7

Change-Id: Iaa1a86955d3821727458555557f832da46ec31eb
Signed-off-by: zijie.hong <zijie.hong@amlogic.com>
2025-08-19 18:37:59 -07:00
hongyu.chen1 b8067f9c95 T6W: config reboot driver. [1/1]
PD#SWPL-207545

Problem:
dts not config.

Solution:
open dts config.

Verify:
t6w

Change-Id: I557f2d72c15b3f1e791bdc4740ab30466da6c933
Signed-off-by: hongyu.chen1 <hongyu.chen1@amlogic.com>
(cherry picked from commit 28a738c940245c22d1237c2b6d70bb695b0cf76f)
2025-08-19 18:37:46 -07:00
hongyu.chen1 691c37ca4c T7: add isp Parent-child relationship in k6.12. [1/1]
PD#SWPL-200841

Problem:
PDID_T7_ISP and PDID_T7_MIPI_ISP There is a
parent-child relationship, but the kernel
driver does not indicate it.

Solution:
add Parent-child relationship.

Verify:
t7

Change-Id: I410d4719c57523de6472b8e03b51f251923a2908
Signed-off-by: hongyu.chen1 <hongyu.chen1@amlogic.com>
(cherry picked from commit 779315837ac3cad331f140331f34fe2e9c5740b0)
2025-08-19 18:37:41 -07:00
Zelong Dong 6c19664362 dts: arm64: support ir sleep pins for t7c/t3 [1/1]
PD#SWPL-226202

Problem:
support ir sleep pins for t7c/t3

Solution:
support ir sleep pins for t7c/t3

Verify:
t7c

Change-Id: Ibd23865d5451b5e9ad731e80f237fae608193048
Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
2025-08-19 18:36:21 -07:00
haitao.liu 6cc3a3a234 vdin: t6w 1080p enable dw [1/1]
PD#SWPL-226679

Problem:
1.DPSS do not support frame rates above 1080p60hz
when MIF is input
2.aa ds registers configured wrongly

Solution:
1.VDIN output dw under 1080p
2.configure the size registers of aa ds

Verify:
t6w

Change-Id: Ic21b0fa0d9d9c2150ec79e240acb3b84f4a6446c
Signed-off-by: haitao.liu <haitao.liu@amlogic.com>
2025-08-19 18:36:15 -07:00
Jianyi Shi 8d358ed94b S6: set interrupt from rising to high level for 6.12. [1/2]
PD#SWPL-224482

Problem:
edge rising interrupt may lost ;

Solution:
change rising to high level;

Verify:
BL201

Change-Id: I3102ef1a665c6193b7fde0ce9a7adf66db6d6110
Signed-off-by: Jianyi Shi <jianyi.shi@amlogic.com>
2025-08-19 18:36:09 -07:00
zijie.hong 2689f5bcba vdin: keystone remove warning cma size [1/1]
PD#SWPL-226702

Problem:
keystone alloc buffer by app
vdin should no warning cma size not enough

Solution:
keystone remove warning cma size log

Verify:
T7C

Change-Id: Ie424bf291e177b070a5bf88f195d5aad7cf79630
Signed-off-by: zijie.hong <zijie.hong@amlogic.com>
2025-08-19 18:36:03 -07:00
wenlong.zhang 2b40a291de drm: skip disable lcd mode [1/1]
PD#SWPL-226123

Problem:
the encl will disable&enable when switch vrefresh, that
caused osd display abnormal

Solution:
the encl should keep enable and just adjust the frame rate

Verify:
t6d

Test:
DRM-OSD-101

Change-Id: I6bdb0aaaabd748d2f1e06aca558938cc6223d53e
Signed-off-by: wenlong.zhang <wenlong.zhang@amlogic.com>
(cherry picked from commit e2b054d5909155789f458ce128660e441b840293)
2025-08-19 18:35:47 -07:00
wenlong.zhang cf09dd1b52 drm: fix logo memory leak [1/1]
PD#SWPL-227503

Problem:
when plugout hdmi cable, logo memory is leaked

Solution:
decrease the ref of logo fb when ui commit happened

Verify:
s7

Test:
DRM-OSD-100

Change-Id: I75b504b038a895955987260ba58e335a7ce40c83
Signed-off-by: wenlong.zhang <wenlong.zhang@amlogic.com>
2025-08-19 18:35:24 -07:00