Commit Graph

4774 Commits

Author SHA1 Message Date
yujun.zhang 8045da2f80 drm: turn off deprecated mif interlace config [1/1]
PD#SWPL-235308

Problem:
Interlace config of osd mif is not used anymore.

Solution:
Force turning off mif interlace config when initializing
OSD registers.

Verify:
T7C, S7D

Test:
DRM-OSD-81

Change-Id: I7b4852b8553dd2984cc1889fcf6990c8e92e8994
Signed-off-by: yujun.zhang <yujun.zhang@amlogic.com>
2025-10-28 09:29:05 -07:00
Pengcheng Chen 35adea747e vpp: used of frame_par instead of cur_frame_par[0] [1/1]
PD#SWPL-235098

Problem:
cur_frame_par[0]->video_input_w only for vd1

Solution:
frame_par->video_input_w instead of cur_frame_par[0]->video_input_w

Verify:
t6w

Change-Id: I2aeb60765bcaaae6b9fd81a99cbea674b8c4b25e
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2025-10-28 05:06:11 -07:00
donghui.wang 12cb9763f5 ldim: optimize transmit start & stop [1/1]
PD#SWPL-234872

Problem:
miss bcon autotrans feature

Solution:
add bcon autotrans feature

Verify:
t6x

Change-Id: Ib0cf055be66eb6c953da2940fe183cb504561b28
Signed-off-by: donghui.wang <donghui.wang@amlogic.com>
2025-10-28 05:05:38 -07:00
yaoyu.xu b7d61d1418 hdmirx:sync code from 5.15 to 6.12 [1/1]
PD#SWPL-234410

Problem:
sync code from 5.15 to 6.12

Solution:
sync code from 5.15 to 6.12

Verify:
t6x

Change-Id: If578b87410020b9c5d2c6d785940a2720d071504
Signed-off-by: yaoyu.xu <yaoyu.xu@amlogic.com>
2025-10-28 05:05:21 -07:00
jinbiao 51a8ed9427 mmc: reduce cali_blk for C3.[2/2]
PD#SWPL-150802

Problem:
The configuration failure.

Solution:
Fix the configuration failure issue.

Verify:
C3_aw409

Change-Id: I5e9ea6a86e54538964744c34c2e6de6095a9187c
Signed-off-by: jinbiao <jinbiao.ou@amlogic.com>
2025-10-28 05:04:56 -07:00
hongyu.chen1 184158952d reboot: add aocpu watchdog reason in kernel. [3/12]
PD#SWPL-228126

Problem:
The kernel needs to be adapted to the aocpu watchdog.

Solution:
add config.

Verify:
build ok

Change-Id: I032224c9558401def04eb85daa443cd79b0b9352
Signed-off-by: hongyu.chen1 <hongyu.chen1@amlogic.com>
2025-10-28 05:03:54 -07:00
ruofei.zhao 5cd0e69059 hdmitx: fix the issue where hdmi_hdr_status indicated incorrectly [1/1]
PD#SWPL-233235
PD#SWPL-235819

Problem:
when the TV's EDID DV support version is V0, hdmi_hdr_status
indicates incorrect

Solution:
fix the issue where hdmi_hdr_status indicated incorrectly

Verify:
S905X5M

Test:
DRM-TX-78

Change-Id: If3906645e6a750aee41a98a81b0978d97a290ee6
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2025-10-28 05:03:41 -07:00
haitao.liu 67be9282c0 vdin: VBI DMC VIOLATION [1/1]
PD#SWPL-232346

Problem:
1.VBI occurs DMC VIOLATION

Solution:
1.sleep 20ms after setting VBI memory

Verify:
txhd2

Change-Id: Ie23565c3d5bfa49b4dff8583ad0f75e7184037f3
Signed-off-by: haitao.liu <haitao.liu@amlogic.com>
2025-10-28 05:03:25 -07:00
Cheng Wang2 197e5cd250 TV: fix meson_cma_heap_allocate kmalloc fail [1/1]
PD#SWPL-226905

Problem:
kmalloc memory fail warning.

Solution:
kmalloc change to vmalloc

Verify:
t7c

Change-Id: I1d85c498c04130826dc67d16871db1118b9688fb
Signed-off-by: Cheng Wang2 <cheng.wang2@amlogic.com>
2025-10-28 02:31:57 -07:00
Feng Chen 2015b4c5da spisg: incorrect "completion" initialization timing [1/1]
PD#SWPL-235045

Problem:
Incorrect "completion" initialization timing:
the subnode driver probes before the spi controller driver,
yet "completion" is initialized after subnode driver probe,
this will cause a panic.

Solution:
fix it.

Verify:
T6X

Change-Id: I1e77973a6c7907dfc65f943d494380d0fea144b6
Signed-off-by: Feng Chen <feng.chen@amlogic.com>
2025-10-28 02:31:45 -07:00
gerrit autosubmit 69c898a04c Merge "drm: add t6x and fix trunk scaler issues in kernel 6.12 [1/1]" into amlogic-6.12-dev 2025-10-28 02:31:09 -07:00
lele xiang 575834ee6b tee: CB0 Playback failed of 4K HLS128 streams. [1/2]
PD#SWPL-233214

Problem:
In the secure playback context, the newly allocated TVP_POOL
was not granted access permissions for vdec/hevc.

Solution:
After allocating a new TVP_POOL, the TEE module checks and
synchronizes the current vdec/hevc access permissions,
add interface with lock

depends on CL:
600559

Verify:
S905X5

Change-Id: Iffa38ffabbb5b8edcf5f54dc88c18e21495b568b
Signed-off-by: lele xiang <lele.xiang@amlogic.com>
2025-10-28 02:30:44 -07:00
Haotian Guo 674922fcef tvafe: sync t6x code [1/1]
PD#SWPL-234398

Problem:
sync t6x code

Solution:
sync t6x code

Verify:
t6x

Change-Id: I9b3bb03bd3c1723ca3f5455309841fc5a47fd5d1
Signed-off-by: Haotian Guo <haotian.guo@amlogic.com>
2025-10-28 02:30:23 -07:00
Jian Cao 650148c349 vpp: keep U-Boot projector setting at startup [1/1]
PD#SWPL-236637

Problem:
projector setting change causes flashing or abnormal frame

Solution:
keep the register bit

Verify:
txhd2

Change-Id: If4ac17202a6e4dc1ba5ef8709a1967b932211ef1
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
2025-10-24 12:02:16 -07:00
Jian Hu b82cfdd23d clk: fix tcon panel off [1/1]
PD#SWPL-234069

Problem:
tcon panel is off during booting

Solution:
add clk_disable_unused for gp2_pll_dco

Verify:
t6x

Change-Id: Ia716888b0612ce8798d136be4174aa11524ec704
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2025-10-24 12:02:11 -07:00
Long Yu 5fe0d88a5e sdio: need to compatible with w1. [1/1]
PD#SWPL-235426

Problem:
Not compatible with w1.

Solution:
Need to be compatible with w1..

Verify:
S7D

Change-Id: Ic3d6d4130c2c540c5b0762e735d1a9a6e8e25804
Signed-off-by: Long Yu <long.yu@amlogic.com>
2025-10-24 07:39:48 -07:00
zhou.han b6ad8533d0 drm: add qms brr modename [1/1]
PD#SWPL-235127

Problem:
add qms brr modename

Solution:
add qms brr modename

Verify:
ross

Change-Id: I9624729669802c06574fb5dc86ef3f15952ec833
Signed-off-by: zhou.han <zhou.han@amlogic.com>
2025-10-24 01:39:57 -07:00
haitao.liu 811b185210 vdin: Optimize ATV electrical performance test results [1/1]
PD#SWPL-221710
PD#SWPL-228333

Problem:
t6w/t6x failed with some ATV electrical performance test items

Solution:
1.optimize h/v sync flow
2.write calibration values into dts

Verify:
t6x/t6w

Change-Id: I44c22547df541d33a468f5c674a254f6b4fed34d
Signed-off-by: haitao.liu <haitao.liu@amlogic.com>
2025-10-24 01:39:02 -07:00
haitao.liu 4db614c75a vdin: t6w/t6x afrce dmc violation [1/1]
PD#SWPL-227842

Problem:
After enabling AFRCE, a DMC VIOLATION issue occurs

Solution:
Allocate memory of an appropriate size.

Verify:
t6x/t6w

Change-Id: Ia47feb853d97860a50b17a6b9cea97f0e100aa6a
Signed-off-by: haitao.liu <haitao.liu@amlogic.com>
2025-10-24 01:38:45 -07:00
yuhua.lin d39f95c983 ge2d: add protection in get_dmabuf [1/1]
PD#TV-176726

Problem:
kernel crash on ge2d module during kernel fuzzing test

Solution:
add protection in get_dmabuf

Verify:
none

Change-Id: I5cdf251799772e0ed7c0667d1e5011169522b9af
Signed-off-by: yuhua.lin <yuhua.lin@amlogic.com>
2025-10-24 01:38:09 -07:00
mingyang.he 2c227eaac5 drm: add t6x and fix trunk scaler issues in kernel 6.12 [1/1]
PD#SWPL-234411
PD#SWPL-235389

Problem:
need bringup t6x
need fix scaler issues

Solution:
bringup t6x silicon in kernel 6.12 and support osd1
scaler move to local
fix trunk local issues for t6d/t6w

Verify:
t6x/t6w

Test:
DRM-OSD-96

Change-Id: Iea82e8a50fa5367711cedb367a535c135c792a2a
Signed-off-by: congyang.huang <congyang.huang@amlogic.com>
2025-10-24 02:23:59 +00:00
Huqiang Qin 2ff437d67e saradc/pdd: force writes to registers with special meanings [1/1]
PD#SWPL-235505

Problem:
PDD interrupt cannot be cleared.

Solution:
Force writes to registers with special meanings.

Verify:
S6/BL201

Change-Id: I0fe48e1c8491082757c00b83804db4c4c0a277c4
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2025-10-23 07:49:04 -07:00
Huqiang Qin 7b8a84b2a4 input: Fix null pointer exception during ioctrl operation [1/1]
PD#SWPL-233259

Problem:
[3 T24990 d.] Hardware name: Generic DT based system
[3 T24990 d.] PC is at input_default_getkeycode+0x88/0xb4
[3 T24990 d.] LR is at 0xffffffea
[3 T24990 d.] pc : [<c0ace8c0>]    lr : [<ffffffea>]    psr: 60000093
[3 T24990 d.] sp : bc493c30  ip : 00000069  fp : bbd093dc
[3 T24990 d.] r10: fffffff2  r9 : c2222438  r8 : c2222400
[3 T24990 d.] r7 : 60000013  r6 : c2222170  r5 : c2222000  r4 : bc493cc0
[3 T24990 d.] r3 : 00000002  r2 : 000001ff  r1 : bc493cc0  r0 : 000000d2
[3 T24990 d.] R1  : bc493cc0, PFN:5fed4 .

Solution:
Remove invalid configurations.

Verify:
S7D/BM201

Change-Id: Idb8448bb646362087655204a5bcc1fe85d0432b8
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2025-10-23 07:48:48 -07:00
Evoke Zhang 769fc40240 lcd: update lvds lane mapping policy [2/2]
PD#SWPL-233665

Problem:
lvds port_swap, lane_reverse no effect when use version3 phy_attr

Solution:
lvds port_swap, lane_reverse will take effect base on version3 phy_attr

Verify:
ay301

Change-Id: Idc3eadac5b5c7d374c9e7f876d3039b9c75c3581
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2025-10-23 07:48:24 -07:00
yicheng shen 22434d5145 cec: t6x bringup [1/1]
PD#SWPL-234413

Problem:
t6x cec bringup

Solution:
t6x cec bringup

Verify:
T6X

Change-Id: I1686df383520a7f47cd61d08208c2720ba71fdbb
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
2025-10-23 01:27:25 -07:00
jing.li1 f0ff8771b3 aucpu: refine aucpu error handling [1/1]
PD#SWPL-236234

Problem:
there are some defects in aucpu error handling

Solution:
refine aucpu error handling

Verify:
t6x

Change-Id: I6cd192ad4321dac87b180bec29139ea4b153c451
Signed-off-by: jing.li1 <jing.li1@amlogic.com>
2025-10-22 22:42:40 -07:00
Pengcheng Chen 1711908700 vpp: fix t6w video reg_dump crash [1/1]
PD#SWPL-235885

Problem:
t6w can not visit VD1_SCO_FIFO_CTRL

Solution:
after t6x visit video reg

Verify:
t6w

Change-Id: I62750694375def2c7637c0611642d4e512e0c3a8
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
(cherry picked from commit e50b923a1c0a3f3fa9bd29bb8adaa99572761e40)
2025-10-22 21:23:25 -07:00
rong.wang ff68af216b deinterlace: use correct alignment without decontour feature [1/1]
PD#SWPL-235827

Problem:
video shakes horizontally when it starts playing.

Solution:
use correct alignment without decontour feature

Verify:
t6d

Change-Id: Id60c08db4a278c769a3fbd80b7482193e636d0fa
Signed-off-by: rong.wang <rong.wang@amlogic.com>
2025-10-22 21:23:06 -07:00
zhou.han 535f7a8c4b drm-hdmi: add sink_device_type property [1/1]
PD#SWPL-233636

Problem:
add sink_device_type property

Solution:
If IEEEOUI is declared in the current EDID, it indicates
that the current device is an HDMI device. Otherwise, it is
a DVI device.

Verify:
qurra

Change-Id: I4667978714afc5d2ed610489ca252c6d50bcb0e7
Signed-off-by: zhou.han <zhou.han@amlogic.com>
2025-10-22 21:22:56 -07:00
rong.wang 9ae5519de1 deinterlace: fix crop err in prelink mode [1/1]
PD#SWPL-231764

Problem:
di didn't do crop in prelink mode

Solution:
fix crop err in prelink mode

Verify:
t5m

Change-Id: Ibcd191bce486f847e46d6caa3f35c73268c45d96
Signed-off-by: rong.wang <rong.wang@amlogic.com>
2025-10-22 16:22:29 -07:00
Pengcheng Chen eb62cfb278 vpp: set status unmute when suspend is mute [1/1]
PD#SWPL-235885

Problem:
vd1 mute before vpu power off when suspend,
vd1 mute reg reset to unmute, but state still mute.

Solution:
set status unmute when suspend is mute

Change-Id: I3d55a42ffd4adca28d689e3b26fa861abc7edaf2
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
(cherry picked from commit 09be1e63630e0dd3e13584aef0370c686e032b52)
2025-10-22 14:26:28 -07:00
Qianggui Song e9350bcc77 Pinctrl: add missing tdm_d4_a function [1/1]
PD#SWPL-236452

Problem:
tdm_d4_a is missing

Solution:
add tdm_d4_a to group

Verify:
local s6

Change-Id: I7965f719891ee10babe09fa6010caefcfe048506
Signed-off-by: Qianggui Song <qianggui.song@amlogic.com>
2025-10-22 06:32:39 -07:00
rong.wang 61930d5883 deinterlace: add dm iocmd for pqserver [1/1]
PD#SWPL-232259

Problem:
add dm iocmd for pqserver

Solution:
add dm iocmd for pqserver

Verify:
s7d

Change-Id: Ica18b8b0347e168a03d0749c5cbe282c1d620ee5
Signed-off-by: rong.wang <rong.wang@amlogic.com>
2025-10-22 06:32:16 -07:00
Jun Zhang 74c7529fb2 BT-RFKILL: fix the duplicated power action on yocto platform [1/1]
PD#SWPL-166565

Problem:
multiple state setting by systemd-rfkill will trigger the
duplicated-power-on action in bluetooth kernel driver, and cause the
WiFi firmware loading failure when the power pin is shared by WiFi
and bluetooth device.

Solution:
add static device blocking state to prevent the duplicated power action

Verify:
t5w/s4/sc2/s7

Change-Id: I37081caed3f59af39b97449113027d22f9740696
Signed-off-by: Jun Zhang <jun.zhang@amlogic.com>
(cherry picked from commit 140e717a53)
2025-10-22 06:32:11 -07:00
yujun.zhang c269e0c9b0 drm: fix invalid plane disabling [1/1]
PD#SWPL-232582

Problem:
Repeated plane disabling will disorder normal sequence of
state swapping & state freeing, and causes KASAN error
"slab-use-after-free".
FYI,if state A is swapped earlier than state B, in the UAF case,
committing on state B would not wait the completion of committing
on state A,and finally makes in-use state A be freed in advance.

Solution:
If crtc is NULL in both old  plane state and new plane state,
repeated plane disabling occurs, and return from ioctl.

Verify:
T7C

Test:
DRM-OSD-81

Change-Id: I2798bce07c0603efaca6ad8ccd0bd6dd78ede4b1
Signed-off-by: yujun.zhang <yujun.zhang@amlogic.com>
2025-10-22 05:18:51 -07:00
chen.xu 799ae30193 amlvideo2: fix black screen issue when recording with osd + video [1/1]
PD#SWPL-236018

Problem:
black screen issue when recording with osd + video.

Solution:
Updated logic to prevent the recording process
from entering the black-screen handling case during
HDMI input to local playback transition.

Verify:
t7c

Change-Id: I3c2a5fcef66f71d7722baf7b082eace4111c8d12
Signed-off-by: chen.xu <chen.xu@amlogic.com>
2025-10-22 00:04:39 -07:00
ruofei.zhao c24f846928 hdmitx: optimize CTA block EDID parsing [2/2]
PD#SWPL-202506

Problem:
When the descriptor offset is greater than 127,
the cta block is not parsed

Solution:
When the descriptor offset is greater than 127,
the cta block needs to be parsed

Verify:
S905X5M

Test:
DRM-TX-78

Change-Id: Ida338ec71b7ba4fc29c762fa9283efb1bab9bfb3
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2025-10-21 22:42:25 -07:00
Wenjie Qiao de85d0e235 hdmitx: edid parse drmdb panic [2/2]
PD#SWPL-191529

Problem:
HFR1-64 edid parse and kernel panic

Solution:
resolve the issue: array index out of bounds

Verify:
s7d

Test:
DRM-TX-

Change-Id: I3184634675c9b0e6105050c3dd1dd86298f0e1b7
Signed-off-by: Wenjie Qiao <wenjie.qiao@amlogic.com>
2025-10-21 22:42:18 -07:00
yufei.huan 5cac5ffa28 deinterlace: postlink 420 10 bit [1/1]
PD#SWPL-231764

Problem:
postlink 420 10 bit

Solution:
postlink 420 10 bit

Verify:
t6d

Change-Id: I3a7ad4bc110ef4a084ed94a474a342c4be689f4a
Signed-off-by: yufei.huan <yufei.huan@amlogic.com>
2025-10-21 03:26:36 -07:00
hai.cao 1e1a074149 vpu: add arb and urgent driver support [1/1]
PD#SWPL-235941

Problem:
add arb and urgent driver support

Solution:
add arb and urgent driver support

Verify:
t6x

Change-Id: Idb5e4146619915a26b783173c03c05d6eb8e118b
Signed-off-by: hai.cao <hai.cao@amlogic.com>
2025-10-21 01:14:41 -07:00
dian.shao deffd4fd5d usb: Amlogic USB2 & USB3 PHY arch, reset, pll cfg updates [1/1]
PD#SWPL-234367

Problem:
Amlogic USB2 & USB3 PHY arch, reset, pll cfg updates.

Solution:
Modify drivers.

Verify:
T966D5-BU301.

Change-Id: I96e1f9cffbaa0116b79a70bac6cdad6f215c3c98
Signed-off-by: dian.shao <dian.shao@amlogic.com>
2025-10-21 01:10:28 -07:00
yufei.huan dbac2286a0 deinterlace: kernel 6.12 debugfs disabled [1/1]
PD#SWPL-232116

Problem:
kernel 6.12 debugfs disabled

Solution:
move /sys/class/debuf to /sys/class/deinterlace

Verify:
s7

Change-Id: I20ca5ea272bd034bf42bf80b604e86143d5a5703
Signed-off-by: yufei.huan <yufei.huan@amlogic.com>
2025-10-20 21:26:11 -07:00
dijie.pan 3ebe2b2fad drm: add osd dimm ctrl [1/1]
PD#SWPL-232549

Problem:
add osd dimm ctrl

Solution:
Implement osd dimm function for debug node

Verify:
s6

Test:
DRM-OSD-82

Change-Id: I295be764dbaee9424fbb44da0834d8b346cfa2c9
Signed-off-by: dijie.pan <dijie.pan@amlogic.com>
2025-10-20 07:44:33 -07:00
Yao Jie 23a86ab776 mailbox: fix device number free failed [1/1]
PD#SWPL-234366

Problem:
cannot create duplicate filename '/dev/char/470:0'

Solution:
fix device number free failed

Verify:
t6x

Change-Id: If2ac55efd11b03102aff436b47aa2293c634e9fc
Signed-off-by: Yao Jie <jie.yao@amlogic.com>
2025-10-20 07:44:27 -07:00
Pengcheng Chen 167899f2e0 vpp: set pps in hsize with VD1_SCO_FIFO_CTRL [1/1]
PD#SWPL-234749

Problem:
vskip=1 and crop, display abnormal

Solution:
set pps in hsize with VD1_SCO_FIFO_CTRL

Verify:
t6x

Change-Id: I767587e63c44c0076797379c6b460f7e7d886427
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
(cherry picked from commit 32a91a9d50713f47accf4a78c411afa18b720c65)
2025-10-20 03:27:06 -07:00
dijie.pan ef9c8633a8 drm: add osd gfcd h/v skip and zorder node [1/1]
PD#SWPL-229367

Problem:
add gfcd hskip vskip and osd zorder in sysfs node

Solution:
add gfcd hskip vskip and osd zorder in sysfs node

Verify:
s6

Test:
DRM-OSD-82

Change-Id: I277b96bf93965856a60dba864c3c8c66eec46862
Signed-off-by: dijie.pan <dijie.pan@amlogic.com>
2025-10-19 21:14:39 -07:00
zijie.hong 321ca998c9 vdin: optimize process to avoid fps is 0 [1/2]
PD#SWPL-183860
PD#SWPL-233621

Problem:
parm.info.fps has been wrongly reset to 0

Solution:
correctly call vdin_get_base_fr()

Verify:
T5M

Change-Id: I2c524d6d393f9c594d2649180d552ccf0ee06006
Signed-off-by: zijie.hong <zijie.hong@amlogic.com>
2025-10-19 20:30:46 -07:00
dian.shao 16f43c5cb4 usb: crg drd glue layer for sw drd selection [1/1]
PD#SWPL-224805

Problem:
DRD role expect to be configured in driver.

Solution:
Add glue layer to populate expected platform devices.

Verify:
t6d & t6x.

Change-Id: I31e59113f8fcccd8b3a4aa9abd82f49d77d3c5fd
Signed-off-by: dian.shao <dian.shao@amlogic.com>
2025-10-19 15:02:42 -07:00
huijie.huang c6b3212a10 lcd: tcon use base timing to switch mode [2/2]
PD#SWPL-234705

Problem:
tcon switch mode cause black screen in apple tv box

Solution:
tcon use base timing to check switch range

Verify:
t6x

Change-Id: If3751818b348302d32f1074f06229c59ef84ee97
Signed-off-by: huijie.huang <huijie.huang@amlogic.com>
2025-10-19 08:22:59 -07:00
yang.zhou e376e2792e uvm: Add protection to the dmabuf in uvm. [1/1]
PD#SWPL-230741

Problem:
When codecmm encounters OOM error, a null pointer issue
will occur in uvm.

Solution:
Add protection to the dmabuf in uvm

Verify:
abdroid-16

Change-Id: I552489f618defd638f611eca0bcb337c27f62dcd
Signed-off-by: yang.zhou <yang.zhou@amlogic.com>
2025-10-19 01:14:14 -07:00