Commit Graph

5235 Commits

Author SHA1 Message Date
Junyi Zhao 986f7cd03f clock: fix code cov [1/1]
PD#SWPL-193226

Problem:
code cov error

Solution:
fix it

Verify:
sc2 ah212

Change-Id: I6bf56fc8a37cf4211db3216ed7ef801bc93463ab
Signed-off-by: Junyi Zhao <junyi.zhao@amlogic.com>
2024-12-23 02:35:36 -08:00
Dezhen Wang 08de83c23e adt4: low-ram adt4 modify dts. [1/1]
PD#SWPL-195958

Problem:
sync dts from 5.15

Solution:
update dts

Verify:
local.

Change-Id: Ida1c3f51185f494179e65bcfd185dd2eefc3ed2a
Signed-off-by: Dezhen Wang <dezhen.wang@amlogic.com>
2024-12-23 02:35:16 -08:00
Jianxiong Pan 21e116a6a9 mm: fix large slab statistics error. [1/1]
PD#SWPL-197513

Problem:
Large slab optimization leads to statistical errors.

Solution:
correct statistics.

Verify:
sc2.

Change-Id: I69b6567fcc709fb0ecf97d7224d26df2a3b8717d
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2024-12-22 17:48:07 -08:00
jian zhou 601c6be0fb audio: set pdm filter default value [1/1]
PD#SWPL-197018

Problem:
loopback and vad can't get pdm filter value if
they can't get pdm node from dts config.

Solution:
set pdm filter default value.

Verify:
t5m

Change-Id: I5d390531969a8585d9c665172ba53d4b473a1862
Signed-off-by: jian zhou <jian.zhou@amlogic.com>
2024-12-22 17:47:56 -08:00
Jianxiong Pan 09e9ba9bdf mm: fix reserved memory statistics error. [1/1]
PD#SWPL-196879

Problem:
Memory: 1919048K/2097152K available (16832K kernel code, 2014K rwdata,
11228K rodata, 4416K init, 584K bss, 18446744073709099852K reserved

Solution:
we initialize cma in advance in cma.c,
which results in that the cma counted twice.

Verify:
sc2.

Change-Id: Ia92b90c8876e58f8a875f3d59b780ce465a6e53a
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2024-12-22 17:47:16 -08:00
biao.sun 3b3d34c490 mm: memory optimization [1/1]
PD#SWPL-192258

Problem:
save memory

Solution:
remove some unnecessary config

Verify:
sc2

Change-Id: Ib70bf996d0af482f6cdb04b92953ad281299c440
Signed-off-by: biao.sun <biao.sun@amlogic.com>
2024-12-22 17:46:54 -08:00
ruofei.zhao 76bd59081f hdmitx: add hdr debug information [1/1]
PD#SWPL-196322

Problem:
add hdr debug information

Solution:
add hdr debug information

Verify:
S905X4

Test:
DRM-TX-92

Change-Id: If26e0f077104bb35a28d8d4cfd5d2a1d7be00d50
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2024-12-22 17:46:31 -08:00
chuntian.miao 88fae97d47 audio: fix for bootup noise [1/1]
PD#SWPL-197267
PD#OTT-70422

Problem:
noise always appear during bootup.

Solution:
remove ACODEC DAC dapm control to avoid noise.
this solution porting from cl
Idaf8a832c98b7fe24636cd69ac413b529bab8a8e

Verify:
SC2

Change-Id: I0a04df8d30a32136cf343a0260fe07c14bda2881
Signed-off-by: chuntian.miao <chuntian.miao@amlogic.com>
2024-12-22 17:46:02 -08:00
xiang.wu1 b1c4b343c3 hdmitx: clear hdmitx_drm_hook api [1/1]
PD#SWPL-196767

Problem:
clear hdmitx_drm_hook api

Solution:
clear hdmitx_drm_hook api

Verify:
SC2

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

Change-Id: I446b3e035835e8fd35bb3c9e22c95b663ada6caf
Signed-off-by: xiang.wu1 <xiang.wu1@amlogic.com>
2024-12-22 17:45:34 -08:00
qinglin.li c1b59c443a dmc_monitor: filter tvp alloc_from_cma function [1/1]
PD#SWPL-196060

Problem:
tvp use alloc_from_cma alloc protect memory
when dmc access this range, will be creat serror

Solution:
dmc filter tvp alloc_from_cma memory by pagetrace

Verify:
local

Change-Id: I8aff1a76e8f774ae7cc665f62756ef3a510ddd29
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2024-12-22 17:45:18 -08:00
Matthew Shyu 8e25f1693b tdes: correct tdes buffer on 64 bit bus [1/1]
PD#SWPL-197265

Problem:
Access violation seen on TDES

Solution:
Correct the buffer address in TDES

Verify:
S6

Change-Id: I068cb8b73968467b160c93e96daa21b1036f07d8
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
2024-12-20 02:08:24 -08:00
pengzhao.liu 20d74be65f kernel: synchronize autoreview script to 6.12 [1/1]
PD#SWPL-197154

Problem:
synchronize autoreview script to 6.12

Solution:
synchronize autoreview script to 6.12

Verify:
git commit

Test:
git commit

Change-Id: I3d3007f4c5b5a3ef552a3faf206013466e87a980
Signed-off-by: pengzhao.liu <pengzhao.liu@amlogic.com>
2024-12-19 23:38:12 -08:00
yujun.zhang 5d3eb012ab drm: add video cap, src buf size prop [1/1]
PD#SWPL-187716

Problem:
Userspace needs get video cap, src buf size
by drm property

Solution:
Add video plane properties

Verify:
sc2

Test:
DRM-OSD-81

Change-Id: I5dc81140d8f4f5bc55c8cd8b454d6f4731b80e0b
Signed-off-by: yujun.zhang <yujun.zhang@amlogic.com>
2024-12-19 23:38:05 -08:00
Hanjie Lin 86eed2b8bd user_fault: add mmap_read_trylock in show_vma [1/1]
PD#SWPL-197216

Problem:
mmap should be locked in show_vma or may caused WARNING

Solution:
add mmap_read_trylock

Verify:
sc2

Change-Id: I29cb7fc4f03b9db90c9e6daf98618657a4724f38
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2024-12-19 20:58:08 -08:00
qinglin.li 314a41f241 modules: remove kunit test modules [1/1]
PD#SWPL-197249

Problem:
kunit test modules is build as gki modules,
but not in system_dlkm img and is not needed normal

Solution:
get all gki modules, and only save need

Verify:
local

Change-Id: I7ee3010faa86d7567823f2a1bc7cb48155c9e781
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2024-12-19 20:58:02 -08:00
Jianxiong Pan add13682c0 mm: enable aml_cma for gki20. [1/1]
PD#SWPL-196879

Problem:
enable aml_cma for gki20.

Solution:
add aml_cma.ko for gki20.

Verify:
sc2.

Change-Id: I360c4b77b632cea82e128c319283d5e425252019
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2024-12-19 20:57:36 -08:00
Dezhen Wang 9e4283999e debug: sync debug/audio_utils.c patch from 5.15 [1/1]
PD#SWPL-196412

Problem:
sync common_drivers/drivers/debug/audio_utils.c patches
from amlogic-5.15-dev to amlogic-6.12-dev branch

Solution:
sync patch

Verify:
Local

Change-Id: I802292b9bc2106e7779752d52235e8cacd4f7779
Signed-off-by: Dezhen Wang <dezhen.wang@amlogic.com>
2024-12-19 20:57:30 -08:00
Liming Xue 762450bd7b thermal: kernel6.12 sc2 bind gpu cooling device [1/1]
PD#SWPL-197095

Problem:
the code logic of the thermal common binding cooling device in
kernel6.12 has been changed.the previous dts configuration is no longer
applicable and needs to be modified

Solution:
modify the configuration of the dts cooling device based
on the thermal common binding logic

Verify:
sc2

Change-Id: I4f6b128837fc16613d2c81b98204cda524f0d261
Signed-off-by: Liming Xue <liming.xue@amlogic.com>
2024-12-19 20:57:24 -08:00
Pengcheng Chen 50b0b8d313 vpp: improve dejaggy_en condition [1/1]
PD#SWPL-196130

Problem:
improve dejaggy_en condition

Solution:
improve dejaggy_en condition

Verify:
s6

Change-Id: I20c77ec8b6c1995f44d501b9002397d3dc469e19
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
(cherry picked from commit e030e076bc)
2024-12-19 20:57:17 -08:00
chuntian.miao 973d6d6b89 Audio: fifo delay [1/1]
PD#SWPL-190049
PD#TV-132399

Problem:
improve fifo delay

Solution:
choose the mini value for fifo delay,
from period bytes, fifo depth and one ms fifo size.
cherry pick Id32d31af8ebb0929e0d9b18f44947ce14a7b250a

Verify:
local test + ohm

Change-Id: I6db7b272a521d79d08f6f27f676143d87b8e6b72
Signed-off-by: chuntian.miao <chuntian.miao@amlogic.com>
2024-12-19 20:57:07 -08:00
Wenjie Qiao 739d851596 hdmitx: cts HF1-66 test fail [2/2]
PD#SWPL-196173

Problem:
cts HF1-66 test fail, the edid only support 480p and 576p,
but the UI display 720p and 1080p, select 720p and 1080p
will test fail

Solution:
before: will set default vic when edid has one block
now: set the default vic only when no vic or edid invalid

Verify:
s7d

Test:
DRM-TX-142

Change-Id: Ia4cc91d21ec974a22b4c44fcc8abddebdec3c212
Signed-off-by: Wenjie Qiao <wenjie.qiao@amlogic.com>
2024-12-19 20:56:49 -08:00
baocheng sun d7c31a369e uvm: update api of get video info [1/2]
PD#SWPL-188294

Problem:
expend get video info ioctl to get vframe souce crop

Solution:
update api of get video info

Verify:
sc2

Change-Id: I6928c9d28d9123a062297a2c04e23af66f476669
Signed-off-by: baocheng sun <baocheng.sun@amlogic.com>
2024-12-19 20:56:06 -08:00
zhou.han 72577f2836 hdmitx: fix kernel6.12 UBSAN error [1/1]
PD#SWPL-194784

Problem:
kernel6.12 UBSAN error:
index 141 is out of range for type 'struct dtd[16]'

Solution:
When dtd_idx is less than 15, idx++

Verify:
sc2

Test:
DRM-TX-38

Change-Id: I0cf5b2d6728e5f13770b0941eaf8ddb9e63e60f3
Signed-off-by: zhou.han <zhou.han@amlogic.com>
2024-12-19 20:55:25 -08:00
Jianxiong Pan a00c19af4d mm: add amlogic vmap stack for arm64. [1/1]
PD#SWPL-197160

Problem:
kernel stack optimization.

Solution:
add amlogic vmap stack for 64bit.

Verify:
sc2.

Change-Id: Ie3b059022e1ab8479f65921ec6fe171824fcd9a1
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2024-12-19 20:55:11 -08:00
qiyao.zhou 45655dec2f drm: use new interface from videodisplay [3/3]
PD#SWPL-190687

Problem:
Add videodisplay module.

Solution:
Use new interface from videodisplay module.

Verify:
sc2

Test:
DRM-OSD-81

Change-Id: Ie27d02d210115b4d24f9f2ec3748444c800996b2
Signed-off-by: qiyao.zhou <qiyao.zhou@amlogic.com>
2024-12-18 18:20:42 -08:00
Zhuo Wang 1c2ef91860 eth: sync dts setting [1/1]
PD#SWPL-195015

Problem:
sync dst setting

Solution:
make all the dts setting as eth same for eth

Verify:
ADT4+

Change-Id: Ie56777d0a3621bea1861186a49d45e83ffef4ee1
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
2024-12-18 18:10:25 -08:00
Chuan Liu f27db1bbf5 clk: Fix the SCMI shmem cache issue [2/2]
PD#SWPL-196548
PD#SWPL-196423

Problem:
In the Kernel, reading and writing SCMI shmem is non-cache, but in bl31
it is cache. Therefore, it will cause an abnormal SCMI communication
between BL31 and the Kernel due to the cache synchronization issue.

Solution:
SCMI shmem of bl31 is changed to non-cache.

Verify:
A113X2/S905C2

Change-Id: I911a9dd3382b195cb7a16719fa13e290446ba160
Signed-off-by: Chuan Liu <chuan.liu@amlogic.com>
2024-12-18 18:06:45 -08:00
qiyao.zhou eb1d45870a videodisplay: add videodisplay module in 6.12 [1/3]
PD#SWPL-190687

Problem:
Add videodisplay module.

Solution:
Add videodisplay module.

Verify:
txhd2

Change-Id: I8851593973864d54e9d6d5d7889243e8cffdb293
Signed-off-by: qiyao.zhou <qiyao.zhou@amlogic.com>
2024-12-18 18:06:23 -08:00
zhenteng.tian eee5a6e98c vc: send 10bit YUV data to vpp. [1/1]
PD#SWPL-192244

Problem:
vc need to send 10bit YUV data to vpp

Solution:
send 10bit YUV data to vpp

Verify:
T5M

Change-Id: Ifacf9e8513e88de5435c24e41645cf1c3ce0f5d7
Signed-off-by: zhenteng.tian <zhenteng.tian@amlogic.com>
2024-12-18 02:52:56 -08:00
Jianxiong Pan 94f1f464f5 mm: reduce print info when oom. [1/1]
PD#SWPL-193855

Problem:
print too much log when oom.

Solution:
pagetrace prints above 1M of info.

Verify:
sc2.

Change-Id: I12c5de2f6ebfc9591fb722f1f8a0c57b18f0a48f
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2024-12-18 00:11:41 -08:00
Hanjie Lin 0edfce553a user_fault: get faked init_mm from ttbr1_el1 [1/1]
PD#SWPL-197053

Problem:
disabled CONFIG_KALLSYMS_ALL cause user_fault can't find init_mm

Solution:
get a faked init_mm from ttbr1_el1

Verify:
sc2

Change-Id: I95c711abcc9b37205b742e7ac7839acc65466bc7
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2024-12-18 00:11:36 -08:00
dian.shao be5286294d usb: s6 u3phy pll parameters updates [1/1]
PD#SWPL-196777

Problem:
s6 u3phy pll parameters updates.

Solution:
Modify driver(hard coded).

Verify:
S6

Change-Id: I17326e0e6e867e7671788753df023e163dd1f9be
Signed-off-by: dian.shao <dian.shao@amlogic.com>
2024-12-18 00:10:17 -08:00
zhan.wang e930458304 amvecm: sc2 dts [1/1]
PD#SWPL-196867

Problem:
sc2 dts not match

Solution:
modify dts

Verify:
verify on sc2

Change-Id: I1bc1ccc2a6642070483166362504599ea3e9e1a5
Signed-off-by: zhan.wang <zhan.wang@amlogic.com>
2024-12-17 18:40:21 -08:00
qinglin.li 3958c808c7 VTS: kernel_proc_file_api_test failed [1/1]
PD#SWPL-196487

Problem:
vts test /proc/sys/ node failed
function sysctl_check_table failed
because autopatch add a null node in kern_table struct

Solution:
remove null node in autopatch

Verify:
local

Change-Id: Ia3647494477b45c06b86ebd51a118718668f53d2
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2024-12-17 03:17:06 -08:00
Pengcheng Chen 2694069d10 vpp: scale down need enable preh for s6 [1/1]
PD#SWPL-196165

Problem:
scale down need enable preh

Solution:
call safa_speed_up_handle for s6

Verify:
s6

Change-Id: I5f5301fb31cd041aebc8446240c339c4ff866739
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
(cherry picked from commit 44337d5c5e)
2024-12-17 03:16:57 -08:00
Jian Cao 340dc7feea vpp: add check for type_ext VIDTYPE_EXT_HIGH_BANDWIDTH [1/1]
PD#SWPL-195155

Problem:
vpp needs to perform line skipping while high bandwidth

Solution:
add the corresponding flag check

Verify:
t5m

Change-Id: I0663dbb6dd0fb90058f8afba4ec7d75c76d77dc6
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
(cherry picked from commit 170cdf7d3d)
2024-12-17 03:16:51 -08:00
Chuan Liu d363427e63 clk: Fix the SCMI shmem cache issue [3/3]
PD#SWPL-196548

Problem:
In the Kernel, reading and writing SCMI shmem is non-cache, but in bl31
it is cache. Therefore, it will cause an abnormal SCMI communication
between BL31 and the Kernel due to the cache synchronization issue.

Solution:
SCMI shmem of bl31 is changed to non-cache.

Verify:
A113L2

Change-Id: Ib113b59209169b57e224f98e0b180b0322764cdf
Signed-off-by: Chuan Liu <chuan.liu@amlogic.com>
2024-12-17 03:16:17 -08:00
Jianxiong Pan f68684c5cb mm: add GFP_NO_CMA flags. [1/1]
PD#SWPL-196879

Problem:
some page fall into cma pool, causing slow cma allocation.

Solution:
add GFP_NO_CMA flags.

Verify:
sc2.

Change-Id: I5a319b7ce85d735e14289786fb5b80cc59f73009
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2024-12-16 23:31:58 -08:00
xiang.wu1 752f005796 hdmitx: module_params clean [1/1]
PD#SWPL-195505

Problem:
module_params clean

Solution:
1. Clear unnecessary module_params.
2. Some functions are implemented through debug nodes.
3. Keep hdmi_authenticated hdmitx_debug  nodes.

Verify:
SC2

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

Change-Id: Iea2981de243d5a52c9da437eb6dacebd0d742d15
Signed-off-by: xiang.wu1 <xiang.wu1@amlogic.com>
2024-12-16 23:31:20 -08:00
Xindong Xu e6fc6b472a dtbo: fix vts FirmwareDtboVerification fail [1/1]
PD#SWPL-196470

Problem:
vts FirmwareDtboVerification fail
dtbo.img invalid

Solution:
fix dtbo.img build error

Verify:
adt4

Change-Id: I9dba7b306e2749675f2ee634480d4880db19eee4
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2024-12-16 03:25:03 -08:00
xiang.wu1 30f7ecad65 hdmitx: optimizes the code for sending 4kx2k vsif packet [1/2]
PD#SWPL-142291
PD#SWPL-196224

Problem:
hdmitx_common_setup_vsif_packet contains
hdmi_set_vend_spec_infofram function, remove unnecessary code

Solution:
remove it

Verify:
sc2

Test:
DRM-TX-136

Change-Id: Ib83474888e704954f3b1861cd20f4f495b87f8cf
Signed-off-by: xiang.wu1 <xiang.wu1@amlogic.com>
2024-12-16 03:24:55 -08:00
Martin Blumenstingl 725a51f78c pinctrl: meson: implement the gpio_chip get_direction callback [1/1]
PD#SWPL-196545

Problem:
Synchronize from upstream.

Solution:
Implement the get_direction callback so we read the direction
from the actual GPIO controller register. This is recommended
by the gpio_chip kernel doc.

Verify:
T6D/BR301

Change-Id: Idc436ae6546ee0985477b69819f84668f46b8f13
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2024-12-16 03:24:49 -08:00
qiankun.wang 69f6eea16e gki_module: add key_value common module_param function [1/1]
PD#SWPL-195506

Problem:
too many module_params extend boot time.

Solution:
Use key-val to obtain module_params information.

Verify:
sc2

Change-Id: I003aad5f0442c30bd729a2ad22001223dda1975a
Signed-off-by: qiankun.wang <qiankun.wang@amlogic.com>
2024-12-16 00:32:30 -08:00
qiankun.wang 227287e31c debug: module_params clean. [1/1]
PD#SWPL-195506

Problem:
too many module_params extend boot time.

Solution:
Use key-val to obtain module_params information.

Verify:
sc2

Change-Id: Id04543738a7a6d179b815910a75482cca9b011d7
Signed-off-by: qiankun.wang <qiankun.wang@amlogic.com>
2024-12-16 00:32:23 -08:00
qinglin.li b3fb387612 upgrade: kernel6.12 upgrade [1/1]
PD#SWPL-195729

Problem:
kernel6.12 upgrade

Solution:
AML_KERNEL_VERSION      5
UPSTREAM_VERSION        "f3dfc92a4f9d"
AML_PATCH_VERSION       "f3dfc92a4f9d"
MERGE_DATE              "2024-12-09"

Verify:
sc2

Change-Id: Ie5c58add45050acff07bc9d6f0af2c7d97ffff15
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2024-12-15 19:28:38 -08:00
yujun.zhang 49d0060f84 drm: fix coverity error [1/1]
PD#SWPL-193205

Problem:
coverity error:
1.Improper use of negative value
2.Uninitialized scalar variable

Solution:
Change "u32" to to "int"
Initialize struct members

Verify:
SC2

Test:
DRM-OSD-85

Change-Id: I6acfedb75ed334488ad44dc35bfcd79765e92d49
Signed-off-by: yujun.zhang <yujun.zhang@amlogic.com>
2024-12-13 03:51:51 -08:00
Feng Chen 16116ca9d2 spi: coverity clean [1/1]
PD#SWPL-193224

Problem:
spi coverity clean.

Solution:
fix it.

Verify:
Local.

Change-Id: I56f0c0090c525e0375ea44438d1468a008b956d6
Signed-off-by: Feng Chen <feng.chen@amlogic.com>
2024-12-13 03:51:35 -08:00
ruofei.zhao 3a2b27e55f hdmitx: add edid parse in hdmitx debug function [1/1]
PD#SWPL-193432

Problem:
add edid parse in hdmitx debug function

Solution:
add edid parse in hdmitx debug function

Verify:
S905X4

Test:
DRM-TX-78

Change-Id: I1a356e16b83c12ca48907322c7a5f8810a756f79
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2024-12-13 01:48:26 -08:00
Junyi Zhao 2d50edc0ea led: fix led str error for 6.12 [1/1]
PD#SWPL-195159

Problem:
6.12 bringup

Solution:
support it

Verify:
sc2 ah212

Change-Id: Ib8992c2f8a5a071202750cba84905e75b6f84572
Signed-off-by: Junyi Zhao <junyi.zhao@amlogic.com>
2024-12-13 01:48:14 -08:00
zhou.han 3a59563387 hdmitx: add allm_cap and dc_cap property [1/1]
PD#SWPL-194387

Problem:
Try to limit the HWC directly r/w  the driver node.

Solution:
Add allm_cap and dc_cap property

Verify:
Android-U

Test:
DRM-TX-20

Change-Id: Ic809be452951844fcf1270c0b584ca832bed1ca2
Signed-off-by: zhou.han <zhou.han@amlogic.com>
2024-12-13 01:47:53 -08:00