Commit Graph

5469 Commits

Author SHA1 Message Date
Pengcheng Chen adb6bfa9b8 rdma: lowlatency rdma channel is overflow [1/1]
PD#SWPL-201312

Problem:
lowlatency rdma channel is overflow

Solution:
alloc EX_VSYNC_RDMA with rdma_table_size

Verify:
s7d

Change-Id: I3b1488b065fda17525481facc301e99a2eeeba95
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
(cherry picked from commit db496221952809cf2a707cc5471fd7003192a638)
2025-02-16 19:12:39 -08:00
Dezhen Wang 40604303e3 scripts: fix 6.12 google code build flags [1/1]
PD#SWPL-201499

Problem:
Google's kernel source code failed to boot up.

Solution:
google kernel build flag is not same with trunk.
remove lto=thin flags

Verify:
local

Change-Id: I7f058756c6ae8f1dab6cde7715d0aed28905215b
Signed-off-by: Dezhen Wang <dezhen.wang@amlogic.com>
2025-02-16 19:12:31 -08:00
nengwen.chen ef8c84af34 atv_demod: fix afc value sync (V3.09) [1/1]
PD#SWPL-159627

Problem:
afc value incorrect.

Solution:
fix afc value sync.
AMLATVDEMOD_VER "V3.09"

Verify:
T5W.

Change-Id: Ie83a3743b8ba373ff7a845f561bfd503dd059345
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2025-02-16 19:11:55 -08:00
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
nengwen.chen 8f328fd455 atv_demod: fix pal bg gde filter and peaking (V3.08) [1/1]
PD#SWPL-159954
PD#TV-100794

Problem:
fix pal bg gde filter and peaking.

Solution:
fix pal bg gde filter and peaking.
AMLATVDEMOD_VER "V3.08".

Verify:
T5M.

Change-Id: I4095c7a0e998b7968670fb9571e87117e5bbba57
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2025-02-13 03:47:08 -08:00
Yao Jie 5fa1dec632 mailbox: t6d mailbox bringup [1/1]
PD#SWPL-202012

Problem:
Need to bringup t6d on k6.12

Solution:
Bringup t6d on k6.12

Verify:
T6D-BR301

Change-Id: I5718d9713f4e831553055f0e10a6add4a1bdc6fc
Signed-off-by: Yao Jie <jie.yao@amlogic.com>
2025-02-13 02:20:26 -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
yujun.zhang bd7d95e609 drm: optimize vpu utils [1/1]
PD#SWPL-86119

Problem:
Some functions don't mean "utility" but are put in vpu util.
Code of RDMA registration is redundant.
Register debugging by overwriting always uses rdma handle of crtc0.
Global array is always allocated whether debugs and sysfs are used
or not.

Solution:
Move those functions out of vpu util.
Use single callback to implement RDMA registration.
Add param in sysfs and debugfs to indicate which index of rdma
handle to use.
Allocate global array only when used.

Verify:
S905D5

Test:
DRM-OSD-78

Change-Id: I4b46776ab0f3e7c3e6ca589fb2e43a2e79b44869
Signed-off-by: yujun.zhang <yujun.zhang@amlogic.com>
2025-02-12 18:39:47 -08:00
lizhi.hu 54b5102ba6 lcd: fix pll div_sel_max [1/1]
PD#SWPL-201218

Problem:
pll para calculated error

Solution:
fix div_sel_max defination

Verify:
s6

Change-Id: Ie6c94de04e7e226c0e48ebd1cc4a151dbb7e1ee4
Signed-off-by: lizhi.hu <lizhi.hu@amlogic.com>
2025-02-12 17:31:13 -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
yao liu 1cb9bc0559 amdv: fix rdma part table bug [1/1]
PD#SWPL-201233

Problem:
amdv write 1a73 through old table, but vpp use
new part table.

Solution:
amdv write 1a73 through new table

Verify:
t5m

Change-Id: If7d4d14d942922d371825b0acbe3e17f73f8b7b8
Signed-off-by: yao liu <yao.liu@amlogic.com>
(cherry picked from commit 66f69143ba3cb6e4bec7423f2560305a1615c999)
2025-02-12 05:56:47 -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
nengwen.chen 987ab48a54 atv_demod: fix get frontend (V3.07) [1/1]
PD#SWPL-156223

Problem:
get frontend params incorrect.

Solution:
fix get frontend.
AMLATVDEMOD_VER "V3.07".

Verify:
T5D/T5M.

Change-Id: Ib6d0b19db0a10040473a56ecc1012365630c9d60
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2025-02-12 03:24:41 -08:00
qiyao.zhou d32125252a di_process: DV input no need do DI. [1/1]
PD#SWPL-201520

Problem:
DV input no need do DI.

Solution:
Add check flow in di_process for this case.

Verify:
t5m

Change-Id: I9c79488b465896cbd085e6c028fa621f7ac26eaa
Signed-off-by: qiyao.zhou <qiyao.zhou@amlogic.com>
(cherry picked from commit 6d8b056067d4086703a1d9a7e78787e6dbc4fa90)
2025-02-12 01:17:44 -08:00
nengwen.chen eb53ce1161 atv_demod: fix scan audio detect and frequency sync (V3.06) [1/1]
PD#SWPL-154153

Problem:
fix scan audio detect and frequency sync.

Solution:
fix scan audio detect and frequency sync.
AMLATVDEMOD_VER "V3.06".

Verify:
T5M/TXHD2.

Change-Id: Id3525e8b4ba673e036a3f6d64ab1afd26a0f2f4d
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2025-02-12 01:17:21 -08:00
kun.liu 61db5e9fd6 codec mm: CB2 Optimize the alignment of TVP and Reserved memory [1/1]
PD#SWPL-187358

Problem:
Optimize the alignment method for TVP and Reserved memory allocation.

Solution:
For buffer allocations without specific alignment requirements,
use the default 4KB alignment, without the need to specify additional
alignment requirements.

Verify:
sc2

Change-Id: I12d5dde882f08e4d8237fb1ba2ba2738bc52f91d
Signed-off-by: kun.liu <kun.liu@amlogic.com>
2025-02-12 01:16:20 -08:00
mingyang.he 556d813c63 drm: optimize logo init [1/1]
PD#SWPL-83183

Problem:
current logo init process commits each time when sets config

Solution:
set state config multiple times and commit once in logo init

Verify:
t7 t3x

Test:
DRM-OSD-2

Change-Id: I2dabee249d1e1c8399d996b1e8377413bc8290f5
Signed-off-by: mingyang.he <mingyang.he@amlogic.com>
2025-02-12 01:16:13 -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
yao liu 7371cec800 amdv: t3x display abnormal [1/1]
PD#SWPL-199701

Problem:
1.For t3x,some registers require sequential writing,
with some bits written first and some bits written last,
so part tables cannot be used
2.Rdma write(clk reg) has not taken effect in next vsync because
rdma took too long.In this case, read value still 0x55, the next
write "or" operation will include 0x55 again.

Solution:
1.move t3x to original table;
2.remove "or" operation for clk reg.

Verify:
t3x

Change-Id: I89085f51c1cecc11ac866ee7bb1852152b5f3f0a
Signed-off-by: yao liu <yao.liu@amlogic.com>
(cherry picked from commit 867ba476e59c08a309d291c9abf380f1a042dc42)
2025-02-12 00:19:51 -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
chenyang.liu 6ee7a2ad53 lcd: fix mem leak, null ptr and wild ptr with driver removed [1/1]
PD#SWPL-198193

Problem:
make sure resource clean with driver removed

Solution:
fix mem leak, null ptr and wild ptr with driver removed

Verify:
t6d

Change-Id: Ic48ae83f7300f88fe8580d5e39ccd50d135136c2
Signed-off-by: chenyang.liu <chenyang.liu@amlogic.com>
2025-02-11 06:08:47 -08:00
Dezhen Wang 5dd30157f8 android: Revert-ANDROID-eliminate-CONFIG_GKI_NET_XFRM_HACKS.patch. [1/1]
PD#SWPL-201750

Problem:
ADT4 unable to boot after flashing the build ab/13042300

Solution:
Revert-ANDROID-eliminate-CONFIG_GKI_NET_XFRM_HACKS.patch.

Verify:
local

Change-Id: Iad599c54f1e8bf957b27f64f46553a84e089951d
Signed-off-by: Dezhen Wang <dezhen.wang@amlogic.com>
2025-02-11 06:06:03 -08:00
hang cheng 646863879b hdmitx: move esm code to hdmitx driver [1/1]
PD#SWPL-199994

Problem:
esm is a sub-module for hdmitx driver, and not a
common module, should move to hdmitx driver, and
remove CONFIG_AMLOGIC_ESM

Solution:
move esm code to hdmitx driver

Verify:
sc2

Test:
DRM-TX-37

Change-Id: Ibab166bf08eb6ae9e708b92cc1cf052a323fb084
Signed-off-by: hang cheng <hang.cheng@amlogic.com>
2025-02-11 06:05:48 -08:00
jialong.jiang 3e410b4f67 amdv: sync 6.12 code. [1/1]
PD#SWPL-201491

Problem:
from SWPL-201491 and SWPL-200840

Solution:
sync code

Verify:
s7d

Change-Id: I18714f61aa453fb13d96abd18c0a19ae35e6a47b
Signed-off-by: jialong.jiang <jialong.jiang@amlogic.com>
2025-02-11 06:05:40 -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
zhou.han a6b772f611 hdmitx: sync hdmitx_edid_parse.c from 5.15 to 6.12 [1/1]
PD#SWPL-200236

Problem:
The code of the two branches is different

Solution:
sync code

Verify:
s7d

Test:
DRM-TX-78

Change-Id: I72b702a110ad61bbcc0360fbbf98651ee8d0e07d
Signed-off-by: zhou.han <zhou.han@amlogic.com>
2025-02-11 03:55:34 -08:00
chuangcheng.peng 3ee3bcee7f demux: reduce stack [1/1]
PD#SWPL-199176

Problem:
stack is high

Solution:
reduce stack

Verify:
verified at sc2

Change-Id: I2b62333f61bfa2667904224e7d6a245662ab2690
Signed-off-by: chuangcheng.peng <chuangcheng.peng@amlogic.com>
2025-02-11 03:55:24 -08:00
zhenteng.tian 1f6ba4c655 vc: avoid defining large struct on the stack. [1/1]
PD#SWPL-201374

Problem:
the stack of video_composer_task is larger than 2048

Solution:
avoid defining large struct on the stack

Verify:
SC2

Change-Id: I54fb7e2fe7eb0ca12196bf2168bee2fe840b0f45
Signed-off-by: zhenteng.tian <zhenteng.tian@amlogic.com>
2025-02-11 03:06:19 -08:00
shufei.zhao 13f3fdcfe4 s6: add 2g dts [1/2]
PD#SWPL-200883

Problem:
boot err

Solution:
add 2g dts

Verify:
s6

Change-Id: I24af7f4790190f5cff28887b6ea4537e5b7b6be7
Signed-off-by: shufei.zhao <shufei.zhao@amlogic.com>
2025-02-11 03:05:10 -08:00
zongdong.jiao c02dc1d666 hdmitx: remove AVI/VSIF setting of BIST pattern [1/1]
PD#SWPL-200325

Problem:
When enable BIST pattern, the extra AVI/VSIF setting may affect
the HDR signal.

Solution:
Remove AVI/VSIF setting of BIST pattern

Verify:
sc2/s5

Test:
DRM-TX-47

Change-Id: I895c15791b79339363faedea95077571fce1c3a0
Signed-off-by: zongdong.jiao <zongdong.jiao@amlogic.com>
2025-02-11 03:05:02 -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
hai.cao 0c20176d1b rdma: add rdma mirror table [1/1]
PD#SWPL-199463

Problem:
bit write read from real reg

Solution:
add mirror table for new optimize function

Verify:
all chips

Change-Id: Ic27859512c3fa17da91c4d0adb5afcd8576b6d0c
Signed-off-by: hai.cao <hai.cao@amlogic.com>
2025-02-11 01:13:07 -08:00
hai.cao 926b7cfb11 vpp: add new aspect ratio algorithm [1/1]
PD#SWPL-199370

Problem:
aspect ratio algorithm precision issue

Solution:
add new aspect ratio algorithm, used numerator
and denominator

Verify:
s6

Change-Id: I9ff7aa25e0d0eb59fffac4c5b5ef420d63c3919e
Signed-off-by: hai.cao <hai.cao@amlogic.com>
2025-02-11 01:13:01 -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 23e5635575 dtv_demod: update code from 5.15 [1/1]
PD#SWPL-196435

Problem:
update code from 5.15

Solution:
update code from 5.15
AMLDTVDEMOD_VER V3.5.027 to V3.6.016.

Verify:
ohm.

Change-Id: Ib37f7d36045c3a51d30ccfcafe3512dccfd6becb
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2025-02-11 01:12:41 -08:00
nengwen.chen f5dbfc5fda atv_demod: fix cvbs line output jitter (V3.05) [1/1]
PD#SWPL-153338
PD#TV-97499

Problem:
cvbs line output jitter.

Solution:
adjust vagc.
remove line lock judgment for the audio state.
AMLATVDEMOD_VER V3.05.

Verify:
T5D.

Change-Id: Ica226603b5036ce05442fc07af2f9960813a23e2
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2025-02-11 01:12:27 -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 4797adb9c4 camera: kernel 6.12 support camera [1/1]
PD#SWPL-201019

Problem:
kernel 6.12 can not using mipi camera properly

Solution:
sync code from kernel 5.15

Verify:
local

Change-Id: I8d42c0c098d0d11ec7ec86e9227eb394ec041160
Signed-off-by: shuanshuan.jiang <shuanshuan.jiang@amlogic.com>
2025-02-11 01:12:10 -08:00
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