Commit Graph

712 Commits

Author SHA1 Message Date
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
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
Pengcheng Chen 7a150c01e7 vpp: pps nonlinear support fot t3x [1/1]
PD#SWPL-159149

Problem:
pps nonlinear support fot t3x

Solution:
pps nonlinear support fot t3x

Verify:
t3x

Change-Id: I8c00382824e92fac959461dba1f3039dca23960f
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
(cherry picked from commit e62a49dffe)
2024-12-12 19:39:13 -08:00
xiang.wu1 e939e18fb6 hdmitx: remove vrr function point int the meson_hdmitx_dev struct [1/1]
PD#SWPL-186430

Problem:
need remove vrr function point int the meson_hdmitx_dev struct

Solution:
1.remove drm vrr function point callback
2.provide function api

Verify:
SC2

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

Change-Id: Ia0db79a517ac850e8ceec742a9ee52744b6db4fc
Signed-off-by: xiang.wu1 <xiang.wu1@amlogic.com>
2024-12-09 01:31:52 -08:00
Hao Shi e11f5f07ca codec_mm: clear coverity [1/1]
PD#SWPL-193202

Problem:
clear codec_mm coverity.

Solution:
clear codec_mm coverity.

Verify:
Local

Change-Id: Ibd14e9470b50cb67f26691f3c26d3505ecfa1d41
Signed-off-by: Hao Shi <hao.shi@amlogic.com>
2024-12-06 02:31:09 -08:00
lele xiang 89d7459d8f decoder: CF1 Prealloc Mechanism based on single decoder instance. [1/2]
PD#SWPL-188670

Problem:
Prealloc Mechanism based on single decoder instance.

Solution:
Add prealloc function for decoder

Verify:
T6d

Change-Id: Ic88eda66e6eda55607e8846125533295a7cc7f9e
Signed-off-by: lele xiang <lele.xiang@amlogic.com>
2024-12-05 23:42:19 -08:00
Hao Shi c9347601bf codec_mm: add is_reserved_ext_support [1/2]
PD#SWPL-195289
PD#SWPL-195421

Problem:
codec_mm_reserved_ext will removed for  s6 board with 2GB RAM,
the h266 mv buffer needs to support without codec_mm_reserved_ext

Solution:
alloc mv buffer form codec_mm_cma when reserved_ext not exist.

Verify:
BL201-S905X5

Change-Id: I15cd60d8bbc2cd35d2a008b13f2cb8499b9aedc2
Signed-off-by: Hao Shi <hao.shi@amlogic.com>
2024-12-05 22:55:47 -08:00
lele xiang e2c08783cf decoder: CF1 On-demand small block memory allocation and protection. [2/2]
PD#SWPL-191072

Problem:
tvp_pool is too big which affects system efficiency.

Solution:
During secure playback, to alloc mem according to actual requirements

Verify:
T6d

Change-Id: I119a41322e9e1028de73851e3620a50ec8d819a2
Signed-off-by: lele xiang <lele.xiang@amlogic.com>
2024-12-05 19:27:31 -08:00
nengwen.chen 6985834e81 dvb_extern: add i2c driver (V1.22) [1/1]
PD#SWPL-188398

Problem:
add i2c driver.

Solution:
add i2c driver.

Verify:
SC2.

Change-Id: I2690fa3cdde8555987d96942860ef5ab4fd4f474
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2024-12-03 01:37:08 -08:00
Wenjie Qiao cb1fc05bbb hdmitx: not use hdmi_tx_ext.c [1/1]
PD#SWPL-186428

Problem:
not use hdmi_tx_ext.c

Solution:
move the api to hdmitx_common.c

Verify:
SC2

Test:
DRM-TX-78

Change-Id: Idbc869bfa0c1ee7dc267fb31666e82aad4242dc9
Signed-off-by: Wenjie Qiao <wenjie.qiao@amlogic.com>
2024-12-02 19:45:10 -08:00
ruofei.zhao 195caaa1f3 hdmitx: refactor hdr api [1/1]
PD#SWPL-104018

Problem:
hdr api needs to be refactored

Solution:
refactor hdr api

Verify:
S905X4

Test:
DRM-TX-78

Change-Id: I06374f10b367536a2fe3e863f6538e045e308362
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2024-12-01 02:26:57 -08:00
Hao Shi c89a89f74c media_proxy: CB2 correct spelling errors [1/1]
PD#SWPL-188419

Problem:
correct spelling errors

Solution:
correct spelling errors

Verify:
t5m

Change-Id: I839d070752f409136377f01b643ed71b8d8492b9
Signed-off-by: Hao Shi <hao.shi@amlogic.com>
2024-11-28 23:17:30 -08:00
lukang.jia ab04eb7de6 frc: frc sync kernel5.15 to kernel6.12 [1/1]
PD#SWPL-192103

Problem:
frc sync kernel5.15 to kernel6.12

Solution:
frc sync kernel5.15 to kernel6.12

Verify:
T3X

Change-Id: Id500e0b47c170f89074050d633678a554e6a63d7
Signed-off-by: lukang.jia <lukang.jia@amlogic.com>
2024-11-27 18:58:58 -08:00
Jianxiong Pan 48bb91021c aml_media: differentiate config according to tv and ott. [1/1]
PD#SWPL-192258

Problem:
aml_media ko too large, need to reduce the size.

Solution:
differentiate config according to TV and OTT project.

Verify:
local.

Test:
adt4.

Change-Id: I2d45ed0a8021808926954590e0efeeb092089ae4
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2024-11-25 16:59:42 -08:00
jinbiao 4055fc938b mmc: fix coverity error [1/1]
PD#SWPL-193225

Problem:
Coverity defect cleanup.

Solution:
fix coverity error

Verify:
SC2

Change-Id: I598d755aeb2a95d073cfc38343a6283ff7f44abd
Signed-off-by: jinbiao <jinbiao.ou@amlogic.com>
2024-11-21 20:08:51 -08:00
yuhua.lin 92efe2bce1 video: sync code from kernel5.15 to kernel6.12 [1/1]
PD#SWPL-191966

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

Solution:
complete it

Verify:
sc2

Change-Id: I2a3a2c21ef239fa78e52063063cda31f117d086a
Signed-off-by: yuhua.lin <yuhua.lin@amlogic.com>
2024-11-20 06:08:11 -08:00
xiang.wu1 d9467056b9 hdmitx: dump sysfs cleanups [1/1]
PD#SWPL-141552

Problem:
dump sysfs cleanups

Solution:
1.Move the common sysfs nodes to the hdmitx_sysfs_common.c file.
2.Different sysfs nodes are distinguished using macros.
3.Some debug nodes have been moved to the hdmitx_debug function.

Verify:
sc2

Test:

Change-Id: I1ebcd7e6956890925c6f32b928168b979a159f44
Signed-off-by: xiang.wu1 <xiang.wu1@amlogic.com>
2024-11-20 10:29:24 +08:00
ruofei.zhao 1cafaab93a hdmitx: remove edid parser in plugin handler [1/1]
PD#SWPL-158055

Problem:
remove edid parser in plugin handler

Solution:
remove edid parser to drm

Verify:
SC2
S5

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

Change-Id: I44006093c6fff74c23c98a1e89e5d8666a3ecfc4
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2024-11-19 05:46:21 -08:00
Jiucheng Xu c46ca9adf0 cma: export enable interface for using cma buffer for write file [1/1]
PD#SWPL-185295

Problem:
write file cache couldn't use cma buffer.

Solution:
add module param to control the enable/disable using cma buffer for
write file cache.

Verify:
t3/t5w

Change-Id: Ief6506d24298358560f475eb2f11393989819763
Signed-off-by: Jiucheng Xu <jiucheng.xu@amlogic.com>
2024-11-19 02:08:36 -08:00
Jianxiong Pan c7f3f45461 mm: aml_cma: update vendor hook. [1/1]
PD#SWPL-185599

Problem:
update vendor hook.

Solution:
update vendor hook.

Verify:
sc2.

Change-Id: I8887a753fdb1289f7e5716ae7cf79b1b2b45cc2c
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2024-11-18 21:57:11 -08:00
Cheng Wang 7758d8d7d7 frm_lock: sync frame lock code from k-5.15 [1/1]
PD#SWPL-192104

Problem:
sync frame lock code from k-5.15

Solution:
sync frame lock code from k-5.15

Verify:
mk build

Change-Id: I304ff938a3282d4b877f228cf46bfbdb4edf0d86
Signed-off-by: Cheng Wang <cheng.wang@amlogic.com>
2024-11-18 19:56:30 -08:00
Long da8fc9bd34 mmc: Synchronize the 5.15 mmc driver code to the 6.12 kernel. [1/1]
PD#SWPL-188384

Problem:
6.12 kernel lacks some MMC driver functionality.

Solution:
Synchronize the 5.15 mmc driver code to the 6.12 kernel.

Verify:
sc2

Change-Id: Ifdc163b67c4daaee268a0fa9758167c9ef1e56e9
Signed-off-by: Long <long.yu@amlogic.com>
2024-11-18 05:58:51 -08:00
jialong.jiang 21181f4ab2 amdv: sync code from kernel5.15 to 6.12 [1/1]
PD#SWPL-191973

Problem:
sync code from kernel5.15 to 6.12.

Solution:
sync code from kernel5.15 to 6.12.

Verify:
sc2

Test:
selt-test

Change-Id: I5d768e0012cb00297c70d24b3377d9495927a9f5
Signed-off-by: jialong.jiang <jialong.jiang@amlogic.com>
2024-11-18 05:58:43 -08:00
qinglin.li b6bb6672fe ddr_tool: sync patch to 6.12 [1/1]
PD#SWPL-192391

Problem:
sync patch to 6.12

Solution:
sync 14-5.15 commit to 3de6c801e

Verify:
local

Change-Id: Ic45f5a6dec9f66cb1e97c2ce253d35ea87e07734
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2024-11-17 23:50:01 -08:00
zhenteng.tian 9d6fd5a066 video pipeline: sync code from kernel 5.15 to kernel 6.12. [1/1]
PD#SWPL-192397

Problem:
sync code from kernel 5.15 to kernel 6.12.

Solution:
sync code from kernel 5.15 to kernel 6.12.

Verify:
SC2

Change-Id: I8111de9562e80148ebe90cc29fb272dbd1c50259
Signed-off-by: zhenteng.tian <zhenteng.tian@amlogic.com>
2024-11-14 23:50:10 -08:00
Junyi Zhao 4e0a0c6d87 pwm: sync patch from 5.15 [1/1]
PD#SWPL-191874

Problem:
kernel6.12 bring up

Solution:
sync tee patch
sync std hib patch
sync optimize patch

Verify:
sc2 ah212

Change-Id: I5bdb22b1312575a2b533a5d413439a4325d77c23
Signed-off-by: Junyi Zhao <junyi.zhao@amlogic.com>
2024-11-14 04:01:06 -08:00
Junyi Zhao f34313d3bf i2c: sync patch from 5.15 [1/1]
PD#SWPL-191875

Problem:
kernel6.12 bring up

Solution:
sync tee patch
sync std hib patch
sync optimize patch

Verify:
sc2 ah212

Change-Id: Ia7db081c955226125b9d445fe3e2814321c76967
Signed-off-by: Junyi Zhao <junyi.zhao@amlogic.com>
2024-11-14 02:32:00 -08:00
zijie.hong edb893b04f vdin: sync vdin code from k5.15 to k6.12 [1/1]
PD#SWPL-192132

Problem:
sync vdin code from k5.15 to k6.12

Solution:
modified

Verify:
s905x4

Change-Id: I04c7ab5e56a5b94e0046a838ddcd0bdbad6b972a
Signed-off-by: zijie.hong <zijie.hong@amlogic.com>
2024-11-14 02:31:26 -08:00
bowen cheng 26d63cee10 hdmirx: sync kernel 5.15 to 6.12 [1/1]
PD#SWPL-191961

Problem:
sync kernel 5.15 to 6.12

Solution:
sync kernel 5.15 to 6.12

Verify:
sc2

Change-Id: I0458acc2f0f8056baebb68249d3af83c1592e0d6
Signed-off-by: bowen cheng <bowen.cheng@amlogic.com>
2024-11-14 02:31:12 -08:00
qinglin.li 4cf4190da3 kernel6.12: upgrade kernel [1/1]
PD#SWPL-190713

Problem:
upgrade kernel

Solution:
AML_KERNEL_VERSION      4
UPSTREAM_VERSION        "773209423d7b"
AML_PATCH_VERSION       "773209423d7b"
MERGE_DATE              "2024-11-14"

Verify:
local

Change-Id: I78801d5b69c7ddcb6e6f4d5718b9f1f2d44b3ef5
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2024-11-13 19:24:25 -08:00
jing.li1 b6f6b0a5dc dvb: sync code from amlogic-5.15-dev [1/1]
PD#SWPL-188397

Problem:
dvb code fall behind of amlogic-5.15-dev

Solution:
sync code from amlogic-5.15-dev

Verify:
sc2

Change-Id: Ie665f7d6dfbe181cb0306c9a0e6921dd71533bfc
Signed-off-by: jing.li1 <jing.li1@amlogic.com>
2024-11-13 03:54:57 -08:00
rong.wang 6e0792bebd deinterlace: sync code for kernel6.12 [1/1]
PD#SWPL-191950

Problem:
sync code from 5.15 to 6.12

Solution:
sync code from 5.15 to 6.12 except:
1.change type of di_remove from int to void
2.change params of class_create to one
3.change params of _assign_str to one

Verify:
all

Change-Id: I28ee63d523656f41f689116630b4f79f721ec132
Signed-off-by: rong.wang <rong.wang@amlogic.com>
2024-11-13 03:54:37 -08:00
yuhua.lin 02a5293a08 ge2d: sync code from kernel5.15 to kernel6.12 [1/1]
PD#SWPL-191976

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

Solution:
complete it

Verify:
sc2

Change-Id: I44467c892574d07f7401e4db07fd4009b404b3fd
Signed-off-by: yuhua.lin <yuhua.lin@amlogic.com>
2024-11-12 13:57:59 -08:00
yuhua.lin 6de756f551 vpu: sync code from kernel5.15 to kernel6.12 [1/1]
PD#SWPL-192656

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

Solution:
complete it

Verify:
sc2

Change-Id: I54e0be49e6b44bf5211e9c1fc4aa7fc43db5cfd9
Signed-off-by: yuhua.lin <yuhua.lin@amlogic.com>
2024-11-12 13:57:51 -08:00
Yongjie Zhu f17bce8ff6 uvm: fix uvm parameters error [1/1]
PD#SWPL-188409

Problem:
uvm bringup on kernel6.12

Solution:
sync 5.15 uvm code to 6.12
fix uvm parameters error

Verify:
adt4

Change-Id: Ib76e4e20106468cab4eddb71eb7a4717eb554735
Signed-off-by: Yongjie Zhu <yongjie.zhu@amlogic.com>
2024-11-12 04:09:14 -08:00
zhan.wang 763ffb79b9 amvecm: sync amvecm patches to amlogic-6.12-dev [1/1]
PD#SWPL-191851

Problem:
sync amvecm patches  to amlogic-6.12-dev

Solution:
sync code to 6.12

Verify:
sc2

Change-Id: I2072da90744fbdce7c1cbdad98dc930e0fa4275e
Signed-off-by: zhan.wang <zhan.wang@amlogic.com>
2024-11-12 02:10:19 -08:00
Yao Jie 584b583516 mailbox: t5m add aocpu alive check mechanism [1/1]
PD#SWPL-192199

Problem:
When modules send mailbox message to aocpu, sometimes
aocpu can not response because of stuck or interrupt
signal lost, at this time driver modules need to know
whether aocpu is alive or not, this is helpful to debug.

Solution:
Add aocpu alive check mechanism, when aocpu did not
response, system will check and print aocpu status.

Verify:
T5M-AY309

Change-Id: Ibe29fc3d25e0f8b868bb3863417df88215692a93
Signed-off-by: Yao Jie <jie.yao@amlogic.com>
2024-11-08 06:03:06 -08:00
yao zhang1 6df1fef15c boottime: a1 optimize for boottime. [1/1]
PD#SWPL-182789

Problem:
The kernel bootup slower.

Solution:
1.Trim the kernel config
2.Start modules asynchronously
3.Boottime is reduced by 460ms

Verify:
a1 ad403

Change-Id: I0bc013a1339d80d9f5f4d9247168da5773446a95
Signed-off-by: yao zhang1 <yao.zhang1@amlogic.com>
2024-11-08 04:15:11 -08:00
ruofei.zhao 9a3eedf287 hdmitx: sync kernel 5.15 code to kernel 6.12 [1/1]
PD#SWPL-191974

Problem:
sync kernel 5.15 code to kernel 6.12

Solution:
sync kernel 5.15 code to kernel 6.12

Verify:
SC2

Test:
DRM-TX-5

Change-Id: I41a123996765919fb59de27a03e2822087f3ed44
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2024-11-07 05:53:03 -08:00
xiang.wu1 3ae279e31d hdmitx: Encapsulate hdcp api and remove drm callback [1/1]
PD#SWPL-186410

Problem:
need encapsulate hdcp api and remove drm callback

Solution:
1.remove drm hdcp callback
2.encapsulate drm hdcp api in hdmi common directory
3.move tx20 meson_hdcp.c code to tx20 hdmi_tx_hdcp.c
4.the differences in the HDCP process in the DRM HDCP API
are implemented in the TX20 and TX21 files respectively.

Verify:
SC2

Test:
DRM-TX-80

Change-Id: If9d995f06eb365a3fc4006be9949a83f89f8346d
Signed-off-by: xiang.wu1 <xiang.wu1@amlogic.com>
2024-11-06 21:59:12 -08:00