Commit Graph

5430 Commits

Author SHA1 Message Date
Hao Shi cd577ece91 codec_mm: modify codec_mm_kps_config [1/1]
PD#SWPL-201448

Problem:
codec_mm_reg_kprobes failed.

Solution:
modify codec_mm_kps_config and

Verify:
sc2

Change-Id: I25be96c670e08928ad2771c4fc663df48fa91768
Signed-off-by: Hao Shi <hao.shi@amlogic.com>
2025-02-10 01:09:18 -08:00
chuangcheng.peng 9ea1afd489 dvb_ci: remove module parameters to class parameters [1/1]
PD#SWPL-199999

Problem:
remove module parameters

Solution:
remove module parameters to class

Verify:
not verified

Change-Id: Ia07e1ef71087bee2c91b149f58e2a484e5105c3f
Signed-off-by: chuangcheng.peng <chuangcheng.peng@amlogic.com>
2025-02-10 01:08:23 -08:00
nengwen.chen 1274d26871 atv_demod: fix prop setting (V3.04) [1/1]
PD#SWPL-140739
PD#TV-102307

Problem:
some prop set error.

Solution:
fix prop setting.
AMLATVDEMOD_VER "V3.04".

Verify:
T5M.

Change-Id: Ic5c11048629322599dc108260459158a4c79b37e
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2025-02-07 22:03:33 -08:00
Hao Shi 62643ca077 codec_mm: release scatter clearly [1/1]
PD#SWPL-197630

Problem:
When there are multiple owners, the slots and scatter
released by one owner will not be fully released.

Solution:
release no user scatters, no matter how many there are.

Verify:
sc2

Change-Id: I8d0a9cef75e53cdfd78fc39beb064265526b5b10
Signed-off-by: Hao Shi <hao.shi@amlogic.com>
2025-02-07 19:33:28 -08:00
Hao Shi fc3c0b5342 codec_mm: optimize prealloc timeout [1/1]
PD#SWPL-200535

Problem:
job released but not removed form job list when prealloc timeout

Solution:
delete the job from the job list when releasing the job

Verify:
t6d

Change-Id: I0304aa1ef487bbc1db581103b908d32283fe3d7e
Signed-off-by: Hao Shi <hao.shi@amlogic.com>
Signed-off-by: lele xiang <lele.xiang@amlogic.com>
2025-02-06 23:55:02 -08:00
hai.cao a30ad13e83 rdma: add rdma shutdown flow [1/1]
PD#SWPL-201355

Problem:
cpu hanged in rdma_mgr_isr

Solution:
add rdma shutdown

Verify:
all chips

Change-Id: I740135b1ea9f6ab0688281193ed954e304719a0e
Signed-off-by: hai.cao <hai.cao@amlogic.com>
2025-02-06 05:55:07 -08:00
shuanshuan.jiang 9641078c72 camera: fix build error [2/3]
PD#SWPL-201019

Problem:
build error

Solution:
fix build error

Verify:
local

Change-Id: Iff0506cca2a308b576a2764caf570a818288b230
Signed-off-by: shuanshuan.jiang <shuanshuan.jiang@amlogic.com>
2025-02-05 03:03:15 -08:00
Pengcheng Chen c8290e154c vpp: vpu security register used rdma part table [1/1]
PD#SWPL-200914

Problem:
vpp: vpu security register used rdma old table

Solution:
vpp: vpu security register used rdma part table

Verify:
t5m

Change-Id: Ia061b78b9752bd0525a03ae7f0e5cc13ddbfa28d
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
(cherry picked from commit 09a6e644c8894ff305946b612d7164e2e5164fa1)
2025-01-25 22:03:07 -08:00
Pengcheng Chen 568a9ad6c1 vpp: video blurred when 4k1k100hz with some axis [1/1]
PD#SWPL-200388

Problem:
video blurred when 4k1k100hz with some axis

Solution:
1.adjust freq_ratio calc, for 100hz freq_ratio  = 2 not 1
2.fix src format change log crash issue
3.add video_state format log

Verify:
t5m

Change-Id: I713e94a5b2050ba6acbecbd7ceb091ce4bfeaa42
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
(cherry picked from commit 85c2ff0d2156e3491006f73c50003dd6a54b18f1)
2025-01-25 22:03:02 -08:00
yujun.zhang 022c056d83 drm: remove some logo param [1/1]
PD#SWPL-200000

Problem:
Some module param and core param
is duplicated or not used.

Solution:
Remove those logo param

Verify:
s6

Test:
DRM-OSD-81

Change-Id: I5143a08804779384ec2945e138b58622914c6b37
Signed-off-by: yujun.zhang <yujun.zhang@amlogic.com>
2025-01-25 17:45:31 -08:00
yujun.zhang 0bbbc2e7e0 drm: add property for max out size for each crtc [1/1]
PD#SWPL-190777

Problem:
Viu2 can only output 1080p because its scaler can
support max 1080p output.

Solution:
config crtc_max_out_size prop for each crtc

Verify:
S6

Test:
DRM-OSD-9

Change-Id: I9eb2cfc4b26e91cae9a6a5f578d5c97b24c3fde7
Signed-off-by: yujun.zhang <yujun.zhang@amlogic.com>
2025-01-24 04:47:43 -08:00
biao.sun 2b65ef18a8 mm: set dts support 4g ddr for s7d [1/1]
PD#SWPL-200713

Problem:
s7d not support 4g ddr

Solution:
set dts support 4g ddr

Verify:
4g ddr s7d

Change-Id: I4b5d399d08c9f4b722de4bc4169b30c81faa84a6
Signed-off-by: biao.sun <biao.sun@amlogic.com>
2025-01-24 02:58:27 -08:00
Wenjie Qiao 6c0a56e106 hdmitx: audio ddp format may have glitch [2/2]
PD#SWPL-185252

Problem:
nts test fail
ddp format may have audio glitch

Solution:
enable null packet

Verify:
s7d

Test:
DRM-TX-141

Change-Id: I4e4f9cf7ca20cc4e7ec5149094e9b0730ec8e51c
Signed-off-by: Wenjie Qiao <wenjie.qiao@amlogic.com>
2025-01-23 02:10:16 -08:00
shufei.zhao 1194fd950e s6: fix log error [1/1]
PD#SWPL-200053

Problem:
fix kernel log error

Solution:
enable driver

Verify:
s6

Change-Id: I4ce1977afca7c7d989143041e2bf4c3fe68432fc
Signed-off-by: shufei.zhao <shufei.zhao@amlogic.com>
2025-01-22 07:55:46 -08:00
yujun.zhang 52530399e2 drm: split drm dtsi for s905x5 and s905d5 [1/1]
PD#SWPL-199606
PD#SWPL-200749

Problem:
x5 only has one display

Solution:
split drm dtsi for s905x5 and s905d5

Verify:
s6

Test:
DRM-OSD-15

Change-Id: I174f48acd90b6df6d7c80289374c1bc13ac60cc3
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
Signed-off-by: yujun.zhang <yujun.zhang@amlogic.com>
2025-01-22 07:55:38 -08:00
yujun.zhang 1c4dc13642 drm: fix s6 osd dual display issues [1/1]
PD#SWPL-199606
PD#SWPL-186024
PD#SWPL-187610

Problem:
1.mipi screen displays flashing screen
2.the color display on the screen is biased towards green
3.osdblend eco global alpha is not enable

Solution:
1.
osd0/osd1 set OSD_PATH_MISC_CTRL reg  bit4:7 to enable mali
viu2_osd set VPP2_MISC reg bit0 to enable mali
2.
set viu2_osd matrix to yuv when vmode is hdmitx
3.
enable the function of osdblend eco global alpha

Verify:
s6

Test:
DRM-OSD-6

Change-Id: I7ca2d33b5b70b333abfda2a8f158399c1e695abb
Signed-off-by: congyang.huang <congyang.huang@amlogic.com>
Signed-off-by: mingyang.he <mingyang.he@amlogic.com>
Signed-off-by: yujun.zhang <yujun.zhang@amlogic.com>
2025-01-22 07:55:28 -08:00
Chuan Liu d55be75dcc cpufreq: s6: cpufreq bringup for kernel6.12 [1/1]
PD#SWPL-200134

Problem:
cpufreq bringup for kernel6.12.

Solution:
Resolved.

Verify:
S905X5

Change-Id: Ifc6d316a4dc8a9b677db2233afe41dfcd0359065
Signed-off-by: Chuan Liu <chuan.liu@amlogic.com>
2025-01-22 07:55:20 -08:00
baocheng sun da269e3adc videotunnel: only use one module param [1/1]
PD#SWPL-200007

Problem:
module params clean for videotunnel

Solution:
only use one module param

Verify:
adt4

Change-Id: I7281c013aefbfee858e739f1920d36e4e4151b68
Signed-off-by: baocheng sun <baocheng.sun@amlogic.com>
2025-01-22 04:03:09 -08:00
jian zhou bd1d609953 audio: fix s6 error print log [1/1]
PD#SWPL-200143

Problem:
extn: ASoC: Failed to register DAIs: -12

Solution:
1.add acodec regmap
2.remove extn node

Verify:
s6

Change-Id: Ia358b5825d385ed9d5e396537aaef152cc11b78f
Signed-off-by: jian zhou <jian.zhou@amlogic.com>
2025-01-21 07:55:30 -08:00
jian zhou 64fd4ed957 audio: delete useless kcontrols for eARC [1/1]
PD#SWPL-200753

Problem:
too many kcontrols for alsa driver.

Solution:
delete useless kcontrols for eARC

Verify:
t5m

Change-Id: I6ef92757e0c1dc11c9e3d53f70c80f71b84ccadb
Signed-off-by: jian zhou <jian.zhou@amlogic.com>
2025-01-21 07:55:20 -08:00
Mingyen Hung 17a3693f70 aml-trusted-key: module_params clean [1/1]
PD#SWPL-199991

Problem:
Need to clean up unnecessary module_param

Solution:
Clean up unnecessary module_param

Verify:
s7d

Change-Id: I7cc68fe4bfb0edb9a36ed1f4935ef7e78fdca887
Signed-off-by: Mingyen Hung <mingyen.hung@amlogic.com>
2025-01-21 07:55:15 -08:00
yao liu bc9688c285 amdv: rdma new api [1/1]
PD#SWPL-176957

Problem:
rdma read/write optimize

Solution:
rdma read/write optimize

Verify:
s5

Change-Id: If6595ac1d0d1922355791b1c1d918fd54823bb3e
Signed-off-by: yao liu <yao.liu@amlogic.com>
2025-01-21 07:55:09 -08:00
yiting.deng 1a57fc44ab clk: s6: fix clk shmem addr [1/1]
PD#SWPL-199540

Problem:
fix scmi clk shmem addr

Solution:
fix it

Verify:
s6

Change-Id: I3d4d0a4d9eed56388c15638d281733768f2fb875
Signed-off-by: yiting.deng <yiting.deng@amlogic.com>
2025-01-20 20:05:34 -08:00
jialong.jiang 504bc9c65c amdv: get cfg support. [1/1]
PD#SWPL-195125

Problem:
get precision detail, dark detail
and lightsense cap for specified mode

Solution:
get precision detail, dark detail
and lightsense cap for specified mode

Verify:
tv

Change-Id: I490974a05d4607c158ed7838c27634657c73d50c
Signed-off-by: jialong.jiang <jialong.jiang@amlogic.com>
2025-01-20 20:05:27 -08:00
zijie.lin ee479dfb1e lcd: porting from 5.15 to 6.12 [1/1]
PD#SWPL-196854

Problem:
ldim/tcon ko build failed

Solution:
main info
1. porting code from 5.15 to 6.12
2. last CL:500745
3. delete EDP related code
4. do not support unifykey

Verify:
sc2/s7d

Change-Id: I71b2e6a644373d2aaffa33bb783d4d2270b6e9d3
Signed-off-by: zijie.lin <zijie.lin@amlogic.com>
2025-01-20 20:05:19 -08:00
joy.rao 885359b65d resman: CB2 merge from keystone [1/1]
PD#SWPL-198138
PD#SWPL-184729
PD#SWPL-162044

Problem:
1.resource value is pre-estimated size and is inaccurate
2.the timeout for preemption may exceed anr time

Solution:
1.remove resource value check because this just records
the pre-estimated size
2.divide the timeout into small pieces,check multiple times
avoid anr or timeout kill
3.merge from keystone SWPL-184729 SWPL-162044

Verify:
S905X4

Change-Id: I307d3a840e6174583ec5240ba3f6a42214eedb32
Signed-off-by: joy.rao <joy.rao@amlogic.com>
2025-01-20 04:18:36 -08:00
he.he 61bc41d118 usb: add role file conrtol the usb mode [1/1]
PD#SWPL-196779

Problem:
add role file conrtol the usb mode:
/sys/class/usb_role/drd-role-switch/role

Solution:
add role file conrtol the usb mode:
/sys/class/usb_role/drd-role-switch/role

Verify:
crg usb

Change-Id: I471ea5d28cf8e70544d4add9b49b074f6dd56c54
Signed-off-by: he.he <he.he@amlogic.com>
2025-01-20 02:09:54 -08:00
Jianxiong Pan 80b1b7a9f0 dmc: filter pages of isolate migrate type. [1/1]
PD#SWPL-197897

Problem:
The cma allocated by the driver is considered normal access.

Solution:
filter pages of isolate migrate type.

Verify:
local.

Change-Id: I9261f5b2de41b5b9896e4628b0c1e06890f4679f
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2025-01-19 18:14:28 -08:00
binqi zhang 07b4ab9e39 clk: g12a/g12b/sm1: GPU frequency can not up to 850M [1/1]
PD#SWPL-197972

Problem:
1 The clock driver of the g12a/g12b/sm1 is shared.
2 The YOCTO dual-screen display request of SM1 and G12B assigns gp0_pll
to MIPI DSI.As a result, the GPU cannot use gp0_pll, causing the GPU to
run up to 800M instead of the expected 846M.

Solution:
1 By default, gp0_pll is configured to output 846M under the device tree
node of the GPU in the main dtsi.
2 Check whether gp0_pll is configured by overwriting GPU configuration in
the corresponding dts.

Verify:
g12a_u212

Change-Id: I51fdc6af67281356cf50a71c13d9d69ca2d11e02
Signed-off-by: binqi zhang <binqi.zhang@amlogic.com>
2025-01-19 18:14:00 -08:00
Junyi Zhao ca9b2c97e8 clk: t5d/t5w/txhd2: Optimize ko insmod time [1/1]
PD#SWPL-198639

Problem:
The clock of t5d/t5w/txhd2 has two ko
insmod ko consume CPU time, and both ko are insmod when actually used.
In order to optimize startup time, the two ko are merge into one.

Solution:
merge to one ko

Verify:
t5w at301
txhd2 be319

Change-Id: I8c83386c012b85b638f1cf166334e21590683cb3
Signed-off-by: Junyi Zhao <junyi.zhao@amlogic.com>
2025-01-17 02:50:52 -08:00
qing.zhang 9700c03938 audio: SCMS analysis software not change. [1/1]
PD#SWPL-199946

Problem:
The RME soundcard SCMS analysis software not change

Solution:
1. add spdif out channel status with copyright update

Verify:
Test t5m locally.

Change-Id: I7f5e6ea28fba6ec26b4e9783c2574f56a31363c3
Signed-off-by: qing.zhang <qing.zhang@amlogic.com>
2025-01-17 02:50:09 -08:00
Zelong Dong cbbd668333 ir: re-register input device if enable IR mouse [1/1]
PD#SWPL-195993

Problem:
android would not refresh input devices while events
support was update, need to unregister input device.

Solution:
re-register input driver if enable IR mouse

Verify:
sc2

Change-Id: I4e4ce31f9fbfdbd1985db01b9d12ee74418dbfba
Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
2025-01-17 02:49:58 -08:00
Zelong Dong 5db8d03b19 ir: update IOCTL cmds [1/1]
PD#SWPL-195993

Problem:
move ir header file to include/uapi/ & update IOCTL cmds

Solution:
move ir header file to include/uapi/ & update IOCTL cmds

Verify:
sc2

Change-Id: Ib98ccb26746a67d6bc040666101193bd104eee6a
Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
2025-01-17 02:49:51 -08:00
Zelong Dong 6aa263159c ir: support more IOCTL cmds for cdev [1/1]
PD#SWPL-195993

Problem:
need to update cdev

Solution:
1. get/set wakeup key
2. get keymap

Verify:
s7d

Change-Id: Id35809484b154f6f02f0fe3908e6deff096ff8db
Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
2025-01-17 02:49:45 -08:00
xiang.wu1 29d69eba80 hdmitx: kernel 6.12 optimize code architecture [1/1]
PD#SWPL-199409
PD#SWPL-197196

Problem:
kernel 6.12 optimize code architecture

Solution:
hdmitx20 and 21 implement a common main entrance
hdmitx20 and 21 use common hdmitx_dev struct
Remove function pointer calls in drv.c
hdmitx: Implement a public main entrance
implement amhdmitx probe
implement amhdmitx remove
implement suspend/resume

Verify:
s905X4/s905X5M

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

Change-Id: Iddd4bcd97552f86a1c5fdd72f488705f9722c953
Signed-off-by: xiang.wu1 <xiang.wu1@amlogic.com>
2025-01-17 02:49:25 -08:00
Yongjie Zhu e85099afe1 uvm: AVBCD Wrapper support [1/1]
PD#SWPL-184883

Problem:
screencap function in uvm need support AVBCD Wrapper

Solution:
change meson_uvm_fill_pattern() to
avbcd_uvm_fill_pattern()
depend on CL:https://scgit.amlogic.com/#/c/511246/
cherrypick from:https://scgit.amlogic.com/#/c/503985/

Verify:
ohm_wv4

Change-Id: Ibe37e0f027dd9da6a34d60ee4547f1bbb3bb258e
Signed-off-by: Yongjie Zhu <yongjie.zhu@amlogic.com>
2025-01-16 22:45:35 -08:00
Pengcheng Chen 3599477e9d vpp: correct w_in/h_in when calc phase step when aisr enable [1/1]
PD#SWPL-199949

Problem:
display abnormal when zoom and aisr both enable

Solution:
correct w_in/h_in when calc phase step when aisr enable

Verify:
t3x

Change-Id: Ieb18b28700d7eda6057f4c7884d70d9d5d2393b7
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
(cherry picked from commit 70d418de5128b891daf02e7d8b952bb95886bd25)
2025-01-16 13:48:51 -08:00
dongqing.li bb84725f88 ramdump: memcpy 0-24MB on panic for ker-32bit [2/2]
PD#SWPL-192100

Problem:
The 32-bit kernel cannot use the ramdump function.
Because the .text section is typically at 0x00108000,
which will be overwritten by the BL2E/BL33 after
reboot. And the PC side is unable to parse it.

Solution:
1. After kernel panic, use DMA to copy the 0-24MB
region to the 0x09000000 area.
2. Reboot to bl33z, fill compress_section[1] with
the 0x09000000 region.
3. Analyze it using the same method as before.

Verify:
sc2

Change-Id: I3e22beb06321289c6643d3f05ec2d910d5ce0beb
Signed-off-by: dongqing.li <dongqing.li@amlogic.com>
2025-01-16 00:17:41 -08:00
shufei.zhao 3be464c6b2 dts: enable driver [1/1]
PD#SWPL-200293

Problem:
enable driver

Solution:
enable driver

Verify:
A5

Change-Id: Id47c577ad799210c4460f8bbbfe3fa43502940f8
Signed-off-by: shufei.zhao <shufei.zhao@amlogic.com>
2025-01-15 23:13:38 -08:00
Wenjie Qiao e137a4251c hdmitx: AndroidU need hdmi disconnect when suspend [1/1]
PD#SWPL-197836

Problem:
AndroidU framework get hdmi connect status by the node:
cat /sys/class/extcon/extcon0/cable.0/state;
now only the hpd plugout will send extcon node 0;
When suspend and hpd is high, the node is 1, so androidU
framework think hdmi is connected

Solution:
hdmitx_audio_event send 0 by extcon when suspend
hdmitx_hpd_event not use with extcon, just use hdmitx_audio_event

Verify:
s7d

Test:
DRM-TX-143

Change-Id: I8da8fd839885cdbf2f35851c9dfccdae6e73b7bc
Signed-off-by: Wenjie Qiao <wenjie.qiao@amlogic.com>
2025-01-15 18:45:52 -08:00
shufei.zhao 92b20fa33b dts: enable driver [1/1]
PD#SWPL-200053

Problem:
enable driver

Solution:
enable driver

Verify:
s6

Change-Id: I5287d80c8eec4c441ae1a18d35a02a1605286d8c
Signed-off-by: shufei.zhao <shufei.zhao@amlogic.com>
2025-01-15 17:43:44 -08:00
Liqiang Jin b21b1c7596 Nexguard Watermark: display abnormal [1/1]
PD#SWPL-182558

Problem:
Nexguard Watermark display abnormal

Solution:
Get correct frame rate

Verify:
Android U + S6

Change-Id: I4fced28ea92bc537b26d88537e27b847c703f140
Signed-off-by: Liqiang Jin <liqiang.jin@amlogic.com>
2025-01-15 17:43:37 -08:00
jiabin.chen 977111175f wifi: use tee pwm [1/1]
PD#SWPL-197385

Problem:
pwm change to tee, not to be used

Solution:
use tee pwm

Verify:
s6

Change-Id: I50e05ea96ed5deff09bc62c9701ed709a92ce384
Signed-off-by: jiabin.chen <jiabin.chen@amlogic.com>
2025-01-15 17:43:29 -08:00
Junyi Zhao 19214dc984 pwm: open double channel for tee [1/1]
PD#SWPL-196869

Problem:
when pwm's clk be locked by tee, all pwm should follow tee.
so, should support wifi 32K on pwm tee module.
in case of clk of wifi's pwm channel being locked.

Solution:
add  double channel to match wifi 32K legacy used.

Verify:
s6

Change-Id: I09a0ccbdf191ed31f86a6e3fc006672368eedd15
Signed-off-by: Junyi Zhao <junyi.zhao@amlogic.com>
2025-01-15 17:43:18 -08:00
Junyi Zhao 93c0ff8bd0 pwm: s6: update pwm_clk to secure [1/1]
PD#SWPL-193316

Problem:
secure permission needs to be set for the pwm_clk register
related to voltage regulation. Relevant clk configurations
need to be stored in bl31. kernel configurations need to
be deleted.

Solution:
fix pwm clk related to voltage regulation to secure

Verify:
s6_bl201

Change-Id: If0d7d174ad220151add56646bfc5be2675abe658
Signed-off-by: Junyi Zhao <junyi.zhao@amlogic.com>
2025-01-15 17:43:10 -08:00
haitao.liu a8eec22ef8 vdin: set the right card name of v4l2 on s6 [1/1]
PD#SWPL-194241

Problem:
gst need to check the card name for opening mipi camera

Solution:
set card name to meson-s6

Verify:
s6

Change-Id: I3e9281090480016c20131ae0095ffdb82cb0926e
Signed-off-by: haitao.liu <haitao.liu@amlogic.com>
2025-01-15 17:38:48 -08:00
gerrit autosubmit 0099a6e4b2 Merge "mailbox: s6 mailbox bringup [1/1]" into amlogic-6.12-dev 2025-01-15 17:38:05 -08:00
gerrit autosubmit 1925543dc7 Merge "audio: sync code from k5.15 for s6 [1/1]" into amlogic-6.12-dev 2025-01-15 17:37:56 -08:00
gerrit autosubmit 74c25411e1 Merge "mm: aml_smmu: get max_pfn from node instead of find symbol. [1/1]" into amlogic-6.12-dev 2025-01-15 17:37:18 -08:00
yiting.deng 2af302f2fa clk: s6: kernel6.12 clk update [1/1]
PD#SWPL-199540

Problem:
s6 kernel6.12 clk update

Solution:
s6 kernel6.12 clk update

Verify:
s6_bl201

Change-Id: Ie49db439cfc909727bda420afac1b5c31371b7b0
Signed-off-by: yiting.deng <yiting.deng@amlogic.com>
2025-01-15 01:01:46 -08:00