Commit Graph

751 Commits

Author SHA1 Message Date
qinglin.li 7766802d64 upgrade: kernel6.12 upgrade [1/1]
PD#SWPL-201584

Problem:
kernel6.12 upgrade

Solution:
AML_KERNEL_VERSION      6
UPSTREAM_VERSION        "fc99bcd94b4d"
AML_PATCH_VERSION       "fc99bcd94b4d"
MERGE_DATE              "2025-02-13"

Verify:
local

Change-Id: I0c5aa8d45f0f76be16bfc38012b62408c5d53c16
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2025-02-13 22:11:20 -08:00
ruofei.zhao 1e538db635 hdmitx: add hdmitx_clear_all_infoframes_pkt api [1/1]
PD#SWPL-198189

Problem:
optimize clear_pkt api

Solution:
add hdmitx_clear_all_infoframes_pkt api

Verify:
S905X5M

Test:
DRM-TX-78

Change-Id: I4a0d7eaf12aa6a8c899b6dbaf564fbb3fdbf4175
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2025-02-13 04:03:52 -08:00
xiang.wu1 efa0587618 hdmitx: optimization debug command [1/1]
PD#SWPL-197204

Problem:
optimization debug command

Solution:
Add hw/sw prefix for command to distinguish sw/hw debug method

Verify:
sc2/s7d

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

Change-Id: I2cd42f1a7f50039051b3d2dadbdc162ac4c9c624
Signed-off-by: xiang.wu1 <xiang.wu1@amlogic.com>
2025-02-13 02:20:04 -08:00
lele xiang 1828d63b19 codec_mm: CF1 Prealloc Mechanism based on multi decoder instance. [1/2]
PD#SWPL-188671

Problem:
Prealloc Mechanism based on multi decoder instance.

Solution:
Add an instance number attribute to adapt the pre-allocation mechanism
in multi-channel scenarios.

Verify:
T6d

Change-Id: Iec0248a761903816e4a11373ed34fb0b5cde1532
Signed-off-by: lele xiang <lele.xiang@amlogic.com>
2025-02-12 17:23:11 -08:00
dian.shao e821e90c94 usb: k6.12 s6 bringup [1/1]
PD#SWPL-201554

Problem:
k6.12 usb
bringup

Solution:
Porting phy driver.

Verify:
bl201.

Change-Id: Iee0fdae4fd425a3ff1eb5388348ebeb5aa1ef5af
Signed-off-by: dian.shao <dian.shao@amlogic.com>
2025-02-12 05:56:40 -08:00
Evoke Zhang 45f1e4f7c8 lcd: add check_retry and exit cmd support [2/2]
PD#SWPL-197863

Problem:
need support check_retry and exit logic for more lcd_extern usage

Solution:
add check_retry and exit cmd support

Verify:
ay301

Change-Id: I5e0fab730cffc1d6994b444d5152777552f83304
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2025-02-12 00:20:04 -08:00
Evoke Zhang 66aa3177a2 lcd: update bootargs transfer to kernel via lrm [2/2]
PD#SWPL-198192

Problem:
need transmit lcd bootargs to kernel

Solution:
update lcd bootargs transfer to kernel via lrm

Verify:
ay301

Change-Id: I662951fffd6aa14cb565ad0fb055986f900425f3
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2025-02-11 20:23:12 -08:00
dian.shao 19f2fd2f54 usb: sc2 k6.12 bringup [1/1]
PD#SWPL-199348

Problem:
USB
-PHY
-K6.12 Porting sc2

Solution:
Drivers&dts

Verify:

Change-Id: Ie5807e6963cb451e284264ee12fcebb54693e744
Signed-off-by: dian.shao <dian.shao@amlogic.com>
2025-02-11 06:05:12 -08:00
Yongjie Zhu c15099ca04 ion: optimize the address path of dev_ion.h [1/1]
PD#SWPL-201548

Problem:
different modules use different address path
of dev_ion.h

Solution:
move dev_ion.h to include/linux/amlogic/media/,
unify the address path of dev_ion.h

Verify:
ohm_wv4

Test:
kernel compile pass

Change-Id: I1c25128d86d36e4c5d0ea8dbd00c1872f0aac9d6
Signed-off-by: Yongjie Zhu <yongjie.zhu@amlogic.com>
2025-02-11 03:02:07 -08:00
yao liu 3780ac6dab amdv: bypass eyeprotect in sink-led [1/1]
PD#SWPL-198828

Problem:
switch eye protect mode, color not change when dv enable

Solution:
add eye protect support when dv enable, except sink-led

Verify:
s905x4

Change-Id: I8e9a2d805cf6f1cd21410a86046d6779e5dec51f
Signed-off-by: yao liu <yao.liu@amlogic.com>
2025-02-11 01:12:55 -08:00
nengwen.chen 219d275a03 dvb_extern: update code from 5.15 [1/1]
PD#SWPL-196435

Problem:
update code from 5.15

Solution:
update code from 5.15

Verify:
ohm.

Change-Id: I0f14179b5113f21c9cde0bfcaf324a386415661d
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2025-02-11 01:12:21 -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
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
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
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
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
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
Jianxiong Pan cb0ac85dff mm: remove the memory related configs in vendor driver. [1/1]
PD#SWPL-199195

Problem:
prevent the driver from relying on common related configs.

Solution:
remove the memory related configs in vendor driver.

Verify:
local.

Test:
build pass.

Change-Id: Ibbc35ccbee708bb26ab6ecd41522302f309bbb37
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2025-01-14 22:54:39 -08:00
miaohong chen ecbdfd000b AVBCD: CF2 Support screenshot and crop features . [2/3]
PD#SWPL-197097

Problem:
Support screenshot and crop features for AVBCD Wrapper.

Solution:
Support screenshot and crop features for AVBCD Wrapper.
depend on cl:
507199

Verify:
AH212

Change-Id: I8d48a0b6fc750d9a6140b6c42dced09e0f37580b
Signed-off-by: miaohong chen <miaohong.chen@amlogic.com>
2025-01-14 22:30:06 -08:00
can.zhang 51c2856004 amdv: sync 5.15 code, remove module_params [1/1]
PD#SWPL-195517

Problem:
need sync code

Solution:
sync code

Verify:
sc2

Change-Id: If79f37d852a9440c901479f0b58a2fab9ac22eae
Signed-off-by: can.zhang <can.zhang@amlogic.com>
2025-01-14 19:03:58 -08:00
shipeng sun c6a18bfe1c dmabuf_manage: CF2 Support VP9/AV1 No Head [2/4]
PD#SWPL-195582

Problem:
Support VP9/AV1 No Head

Solution:
Support VP9/AV1 No Head

Verify:
SC2

Change-Id: I9b9a6dc28098141c56b9fb8282a977a48925551a
Signed-off-by: shipeng sun <shipeng.sun@amlogic.com>
(cherry picked from commit bf7c56d00e96e03869b2da3e6d33bd5c690f1445)
2025-01-13 18:28:05 -08:00
ruofei.zhao 6c14e1f027 hdmitx: optimize notify_hpd_status api [1/1]
PD#SWPL-199605

Problem:
hdmitx_bootup_notify_hpd_status and
hdmitx_common_notify_hpd_status functions are duplicated

Solution:
Delete hdmitx_bootup_notify_hpd_status and
use hdmitx_common_notify_hpd_status

Verify:
S905X5M

Test:
DRM-TX-78

Change-Id: I67d00852494dce404f36615ec15bf4fcc60cc1ca
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2025-01-13 18:27:51 -08:00
Pengcheng Chen cfea629e55 vpp: modify is_tv_panel api [1/1]
PD#SWPL-190819

Problem:
modify is_tv_panel api

Solution:
modify is_tv_panel api

Verify:
s6

Change-Id: Id4b7e1218f978591726e7365b12a7e8a01f262c9
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
(cherry picked from commit 9501ec66d72460f1c8583dc0794cb3816a3a80a7)
2025-01-12 22:20:31 -08:00
hai.cao 3b828621f4 rdma: optimize rdma write time consuming [1/1]
PD#SWPL-199460

Problem:
sync rdma optimize code

Solution:
sync rdma optimize code

Verify:
all chip

Change-Id: Ifcb67aba168629ccf1bd3563fda10775d5d71ad0
Signed-off-by: hai.cao <hai.cao@amlogic.com>
2025-01-10 02:57:12 -08:00
qiankun.wang 6f7b862c24 gki_module: add key_value common module_param_array function [1/1]
PD#SWPL-195506

Problem:
too many module_params_array extend boot time.

Solution:
Use key-val to obtain module_params_array information.

Verify:
sc2

Change-Id: I60b1c0b6f54d697747e393d2beb540f23a99a59c
Signed-off-by: qiankun.wang <qiankun.wang@amlogic.com>
2025-01-08 22:20:49 -08:00
Tao Zeng 5adfcce57e amfc: sync driver from 5.15 for coverity [1/1]
PD#SWPL-198594

Problem:
coverity issues in amfc driver;

Solution:
1, fix coverity issues;
2, sync driver to support 576Mhz freq;
3, check if soc support amfc;

Verify:
local

Change-Id: Ie0afa615f09fc79e7e4757b5066f3f5aa008e944
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2025-01-07 22:14:16 -08:00
xiangyang.yan 61b3882fd0 eth: sync code from kernel5.15 to kernel6.12 [1/1]
PD#SWPL-197582

Problem:
sync code from kernel5.15 to kernel6.12

Solution:
sync code from kernel5.15 to kernel6.12

Verify:
S7D-S905X5M-BM201#070

Change-Id: I36100f3332297cc0e26fab4cf2013f2ff4fdd2d1
Signed-off-by: xiangyang.yan <xiangyang.yan@amlogic.com>
2025-01-02 23:52:57 -08:00
dian.shao 6e629b1fc7 usb: Refactor usb phy driver [1/1]
PD#SWPL-197735

Problem:
USB phy drivers are messy.

Solution:
Refactor usb phy driver to use phy apis and
group soc-related ops together in separated
soc-tagged file.
Gather scattered dts phy nodes and use one
core phy driver to parse them.

Verify:
s905x5m.

Change-Id: Ie01a105ba77df2d1de50df1cf5ed82b81b8027e5
Signed-off-by: dian.shao <dian.shao@amlogic.com>
2025-01-01 22:59:14 -08:00
Feng Chen fc6d1ec28a s7d : spisg: driver validation [1/1]
PD#SWPL-196203

Problem:
S7D spisg driver validate.

Solution:
adapt the spisg driver.

Verify:
S7D_BM201

Change-Id: If9acb2e94c37792dee248a9a6d1d21693ecbac56
Signed-off-by: Feng Chen <feng.chen@amlogic.com>
2024-12-30 17:38:06 +08:00
Junyi Zhao b627306fc5 pwm: add support for 6.12 [4/4]
PD#SWPL-196730

Problem:
there is no s7 s7d s6 pwm driver

Solution:
add pwm driver
sync cl 450533

Verify:
s7d bm201

Change-Id: I0670c44da86c32e9cbf9103e2f391c3fcf3fe21c
Signed-off-by: Junyi Zhao <junyi.zhao@amlogic.com>
2024-12-30 17:37:25 +08:00
Junyi Zhao 3d563daa34 pwm: add support for 6.12 [3/4]
PD#SWPL-196730

Problem:
there is no s7 s7d s6 pwm driver

Solution:
add pwm driver
sync cl 431451

Verify:
s7d bm201

Change-Id: If41790520dd341b522cc60754dbb1328ba84b337
Signed-off-by: Junyi Zhao <junyi.zhao@amlogic.com>
2024-12-30 17:37:25 +08:00
Junyi Zhao f009d96d79 pwm: add support for 6.12 [1/4]
PD#SWPL-196730

Problem:
there is no s7 s7d s6 pwm driver

Solution:
add pwm driver
sync cl 350967

Verify:
s7d bm201

Change-Id: If992869da29509696485775b1d7a5a0d04670c2f
Signed-off-by: Junyi Zhao <junyi.zhao@amlogic.com>
2024-12-30 17:37:25 +08:00
Tao Zeng c1334247fd amfc: add driver for 6.12 [1/1]
PD#SWPL-195922

Problem:
No amfc driver on 6.12

Solution:
add it

Verify:
local

Change-Id: I781fad57d8d0ecee60a9157a628fef23c2f2c76b
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2024-12-30 17:37:25 +08:00
Junyi Zhao aae84795b0 pwm: support pwm for 6.12 [1/1]
PD#SWPL-195889

Problem:
6.12 bringup

Solution:
support it

Verify:
s7d bm201

Change-Id: I7b7c908dac557fd6ab6e22776270e30f1c22ef0f
Signed-off-by: Junyi Zhao <junyi.zhao@amlogic.com>
2024-12-30 17:36:26 +08:00
brian.zhu 867a4ed957 vpp: update src_crop and afd flow [1/1]
PD#SWPL-186685

Problem:
src_crop has conflict with user crop and overscan setting

Solution:
1. Update crop calculation flow, apply src_crop and user crop together
2. pass the crop information to AFD module

Verify:
Verified on t5w

Change-Id: I8c0d7359153b5fcea5d4abf6abc3b2593bd9a4bc
Signed-off-by: brian.zhu <brian.zhu@amlogic.com>
(cherry picked from commit 45cae0f4e6)
2024-12-27 16:23:59 -08:00
ruofei.zhao 99257a985c hdmitx: update hdmitx version to 20241227 [1/1]
PD#SWPL-195624

Problem:
update hdmitx version for release

Solution:
update hdmitx version to 20241227

Verify:
AH212-S905X4

Test:
DRM-TX-40

Change-Id: I509072c86f2e3be9e8ea456120326e7fc288ab40
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2024-12-27 03:12:52 -08:00
hai.cao fe7a694515 vpp: remove module parameters [1/1]
PD#SWPL-195503

Problem:
remove module parameters

Solution:
remove module parameters

Verify:
sc2

Change-Id: I39341c2cb6970bf97f0c831f0de11bd6a8570391
Signed-off-by: hai.cao <hai.cao@amlogic.com>
2024-12-24 07:52:06 -08:00
ruofei.zhao 40df1c4c40 hdmitx: sync hdmitx_edid_parse.c from kernel 5.15 to kernel 6.12 [1/1]
PD#SWPL-197706

Problem:
sync hdmitx_edid_parse.c from kernel 5.15 to kernel 6.12

Solution:
sync hdmitx_edid_parse.c from kernel 5.15 to kernel 6.12

Verify:
S905X4

Test:
DRM-TX-78

Change-Id: I04a8951286dd86bbe0e128cdc2005f46a2065818
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2024-12-24 07:51:57 -08:00
qiyao.zhou fd769301ff di_process: support for vdec core interlace [1/1]
PD#SWPL-189234

Problem:
support for vdec core interlace.

Solution:
support for vdec core interlace.

Verify:
S905X4

Change-Id: I64ecff0b113ca14ba64a455d465fcaadbad5fca3
Signed-off-by: qiyao.zhou <qiyao.zhou@amlogic.com>
(cherry picked from commit 5caba87741)
2024-12-23 02:36:05 -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
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
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 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
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
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
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
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