Commit Graph

61 Commits

Author SHA1 Message Date
Ao Xu 6cc9aab0a3 drm: sync 5.15 CL to 6.12 drm driver [1/1]
PD#SWPL-188410

Problem:
6.12 drm driver bringup

Solution:
sync 5.15 CL to 6.12 drm driver
delete CONFIG_AMLOGIC_KERNEL_VERSION related code

Verify:
sc2

Test:
DRM-OSD5,DRM-OSD-16

Change-Id: I27819e8d5c733961e0816a84050d0367f22df8fe
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2024-10-17 22:46:45 -07:00
ruofei.zhao 5bf8f3d774 hdmitx: sync kernel 5.15 code to kernel 6.12 [1/1]
PD#SWPL-188403

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: Ie0be7d1be5cf2f5fd197fc77441b5f9d2eff8a1a
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
(cherry picked from commit 8e6c3c05d52f2aad51382d8f51938e647f09b6e4)
2024-10-15 12:25:49 +08:00
hai.cao 8b463e0b48 vpu: vpu code sync from 5.15 [1/1]
PD#SWPL-168198

Problem:
sync code from 5.15 but include module parameters

Solution:
sync code

Verify:
sc2

Change-Id: I62702243b4cb767ef11185970a51f168b5a448a8
Signed-off-by: hai.cao <hai.cao@amlogic.com>
2024-07-12 08:26:57 -07:00
shihong.zheng 0ec1d8f8ee media: h266 format define. [1/1]
PD#SWPL-172885

Problem:
media_modules h266 code depend on h266 format define.

Solution:
define h266 format for video decoder

Verify:
s6 pxp

Change-Id: Ia001b35292691811425de6b7e8c98e9e3e65575d
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
(cherry picked from commit 8582af4d3a)
2024-06-27 12:14:55 +00:00
Hao Shi 542455ffdc amvdec: optimize vdec_info and vframe_counter_s [1/1]
PD#SWPL-168978
PD#SWPL-169060

Problem:
The size of vdec_info and vframe_counter_s of
the kernel and player are out of sync causing
tsplayer AMSTREAM_IOC_GET_MVDECINFO to fail.

Solution:
force structures to be byte-aligned

Verify:
t5w s4d

Change-Id: I14f2388d82288cbaa97dbc309a486f908bf597db
Signed-off-by: Hao Shi <hao.shi@amlogic.com>
2024-06-27 12:13:08 +00:00
Ao Xu aaf207f308 drm: sync drm driver [1/1]
PD#SWPL-160959

Problem:
need sync drm driver

Solution:
need sync drm driver

Verify:
sc2

Test:
DRM-OSD7, DRM-OSD-8, DRM-OSD-9

Change-Id: I328292635bffce869dd05c2f5f75bb348cc32921
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2024-06-27 12:12:06 +00:00
Hao Shi 7f29312c62 amvdec: optimize vdec_info and vframe_counter_s [2/2]
PD#SWPL-160457

Problem:
memcpy beyond individual struct members

Solution:
create a named mirror of an anonymous struct union

Verify:
sc2&sm1

Change-Id: If86c3581ac473bb8e4c2b2021bedcbe44ad406e2
Signed-off-by: Hao Shi <hao.shi@amlogic.com>
2024-06-27 12:12:00 +00:00
mingxiu.sun 2fecc67eb3 vdin: kernel6.6 bring up [1/1]
PD#SWPL-160480

Problem:
kernel6.6 vdin bringup

Solution:
kernel6.6 vdin bringup

Verify:
sm1/sc2 kernel6.6

Change-Id: Ide808797921316e8f3fd9cf9d9814b028756f702
Signed-off-by: mingxiu.sun <mingxiu.sun@amlogic.com>
2024-06-17 02:17:16 -07:00
Wanwei Jiang 43461aec82 kernel6.6: bring up [1/1]
PD#SWPL-145682

Problem:
bring up kernel6.6

Solution:
1. porting kernel6.6
2. compatible with different kernel versions
3. bring up kernel6.6

Verify:
sc2 c2 a4 a5

Test:
None

Change-Id: Ie22af0abc8ea96261e8a8cc7804b58565aedd904
Signed-off-by: Wanwei Jiang <wanwei.jiang@amlogic.com>
2023-12-14 16:55:55 +08:00
mingxiu.sun 15a3f407ab vdin & hdmirx: modify colorimetry delivery method [1/1]
PD#SWPL-125462

Problem:
open the HDMI2.0 ,the color of image is changed

Solution:
add vf info for colorimetry

Verify:
t5m kernel5.15

Change-Id: I126786f130d59fe2977ad8ea46b921aadd302d67
Signed-off-by: mingxiu.sun <mingxiu.sun@amlogic.com>
2023-11-28 08:19:14 -07:00
donghui.wang 9593ac7960 ldim: fix power on duty on kernel [1/1]
PD#SWPL-144978

Problem:
duty change when enter kernel

Solution:
keep duty until get level_idx

Verify:
t3x bc302

Change-Id: I747f6389420d367d34e009f4758110ae49a28220
Signed-off-by: donghui.wang <donghui.wang@amlogic.com>
2023-11-13 20:37:36 -07:00
Gaowei Zhao 9dd6f6e994 hdmirx: dual hdmi input [1/1]
PD#SWPL-134200

Problem:
new feature,dual hdmi input on t3x

Solution:
add code

Verify:
t3x

Change-Id: Ic51e37520a752e122deb7f5ef885456e1ab49781
Signed-off-by: Gaowei Zhao <gaowei.zhao@amlogic.com>
Signed-off-by: Lei Yang <lei.yang@amlogic.com>
2023-11-10 06:47:06 -07:00
linfang.zhao d44cc4a246 drm: add mute plane interface [3/3]
PD#SWPL-143936

Problem:
show or hide video does not work

Solution:
add mute plane interface

Verify:
AP222

Test:
DRM-OSD-111

Change-Id: Ib5898c9a0bc3201d397a3a33a9c073f0799c3aee
Signed-off-by: linfang.zhao <linfang.zhao@amlogic.com>
2023-11-07 04:51:50 -07:00
Song Zhao 84bd527247 msync: sync driver from 5.4 [1/1]
PD#TV-98016

Problem:
5.15 has old driver version.

Solution:
Back port some of the missing change from 5.4 and add CL370123

Verify:
T3X + RDK

Change-Id: I15c7d3bdb1e87aa95aaa4e8238bc4dcd2b5287b6
Signed-off-by: Song Zhao <song.zhao@amlogic.com>
2023-11-06 23:37:49 -07:00
jinbing.zhu d0123a3d3f amvecm: add amvecm ai color enable control ioctl [1/1]
PD#SWPL-144175

Problem:
add new ioctl

Solution:
add new ioctl

Verify:
t3x

Change-Id: I3a4f8eb446059f940bfce3c97b7800f8c90baf0c
Signed-off-by: jinbing.zhu <jinbing.zhu@amlogic.com>
2023-11-06 04:33:31 -07:00
qiang.liu 82b4572a95 vdin: add upper use signal format [1/1]
PD#SWPL-142519

Problem:
driver not add upper layer use format

Solution:
driver add upper layer use format

Verify:
t5w

Change-Id: I6c9ff0487453f5122ca51a2f47f47fc5b656b873
Signed-off-by: qiang.liu <qiang.liu@amlogic.com>
2023-10-18 23:04:12 -07:00
jialong.jiang 6a9f81b3a6 amdv: 5.15 ioc move to uapi. [1/1]
PD#SWPL-140850

Problem:
5.15 ioc move to uapi.

Solution:
5.15 ioc move to uapi.

Verify:
t3.

Change-Id: Icc1bd8efb807a84d55fd3b380fd3a016b34f4849
Signed-off-by: jialong.jiang <jialong.jiang@amlogic.com>
2023-10-18 06:19:13 -07:00
jinbing.zhu a51e859924 amvecm: 515 move struct to uapi [1/1]
PD#SWPL-142608

Problem:
move to uapi

Solution:
move to uapi

Verify:
t5w

Change-Id: Ie6737b1ad87792a6fb5ee5cff101464195da8354
Signed-off-by: jinbing.zhu <jinbing.zhu@amlogic.com>
2023-10-18 04:14:47 -07:00
MingLiang Dong 76f3142fb0 amvecm: add sdr2020 source process [1/1]
PD#SWPL-140725

Problem:
new feature, add sdr2020 source process case

Solution:
new feature, add sdr2020 source process case

Verify:
t5m

Change-Id: I5d4d701c11066bc853b2cf24579363cec44bd963
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2023-10-12 09:25:00 +00:00
Song Zhao d7d8fa829d msync: add mono time into pts structure [1/2]
PD#TV-89282

Problem:
HbbTV need more accurate position.

Solution:
Add two more ioctl to get the A/V pts/mono pair

Verify:
T5W + Sandia

Change-Id: I9bc5408d0b41b4429056e581a18646d16d44fe41
Signed-off-by: Song Zhao <song.zhao@amlogic.com>
2023-10-11 17:57:39 -07:00
mingxiu.sun 37c83f77f6 vdin: Provides vdin1 hist values for the upper layer [1/1]
PD#SWPL-135475

Problem:
txhd2 vdin1 hist uses the vdin0 hist register

Solution:
Open the clk of vdin1 and configure the hist related register

Verify:
txhd2

Change-Id: If86d6fbfd7a760e1a51db98aecce9c37c685687e
Signed-off-by: mingxiu.sun <mingxiu.sun@amlogic.com>
2023-09-27 02:43:46 -07:00
mingyang.he 9efc617238 drm: sync meson_drm 5.15 and 5.4 about 5.15 [1/1]
PD#SWPL-139231

Problem:
meson_drm.h in 5.15 and 5.4 have discrepancies

Solution:
eliminate the difference between 5.15 and 5.4

Verify:
sc2

Test:
DRM-OSD-103

Change-Id: I2f7432dcafc0976fbc67dbeed684280b17953284
Signed-off-by: mingyang.he <mingyang.he@amlogic.com>
2023-09-20 04:38:55 -07:00
yaoyu.xu d5356e600c hdmirx: add support for 240p [1/1]
PD#SWPL-139463

Problem:
add support for 240p.

Solution:
add support for 240p.

Verify:
txhd2

Change-Id: Id2a0e2dec3aad54143cf78a7ce9fbae0568291d0
Signed-off-by: yaoyu.xu <yaoyu.xu@amlogic.com>
2023-09-15 02:54:07 -07:00
yaoyu.xu 495df26260 hdmirx: t3x reb bring up [1/1]
PD#SWPL-136712

Problem:
1.add support for 5k 8k.
2.frl flow.
3.frl overlap.

Solution:
t3x sw flow.

Verify:
t3x

Change-Id: I4aeb0b6fff064db89a13b2f1454ad7cb95e8ed50
Signed-off-by: yaoyu.xu <yaoyu.xu@amlogic.com>
2023-09-11 08:08:35 -07:00
congyang.huang 0747bfb1d9 drm: add mode and attr test ioctl [1/1]
PD#SWPL-118079

Problem:
no ioctl to test mode and attr

Solution:
add ioctl

Verify:
sc2

Test:
DRM-OSD-76

Change-Id: I39fa4f403d7302ca9af22c45389faf642735cdaa
Signed-off-by: congyang.huang <congyang.huang@amlogic.com>
2023-09-11 06:23:46 -07:00
Gaowei Zhao 0bfa23f2f7 hdmirx: support iMax mode [1/1]
PD#SWPL-137268

Problem:
not support iMax mode

Solution:
parse iMax flag from VSIF packet

Verify:
T5W

Change-Id: I3b1c52f132e47d825cf086473c6c60af44c5045f
Signed-off-by: Gaowei Zhao <gaowei.zhao@amlogic.com>
2023-08-31 08:04:21 -07:00
qiang.liu 86d706df8f vdin: if fmt is null send nosig [1/1]
PD#SWPL-137116

Problem:
fmt is null vdin send unstable will black screen

Solution:
if fmt is null send nosig

Verify:
txhd2

Change-Id: I482068d6bbc6aeb867c6c59528d9d8edf3dd79dd
Signed-off-by: qiang.liu <qiang.liu@amlogic.com>
2023-08-24 21:58:41 -07:00
congyang.huang 0aba26a6cd vout: move vout ioctls to uapi [1/1]
PD#SWPL-134166

Problem:
move vout ioctls to uapi

Solution:
move vout ioctls to uapi

Verify:
T5W

Change-Id: Idcb298b99738883cbb9b5e6486248fa698fbfb33
Signed-off-by: congyang.huang <congyang.huang@amlogic.com>
2023-08-23 04:14:24 -07:00
yufei.huan cfdb95cb0e deinterlace: 5.15 pq_api move to uapi [1/1]
PD#SWPL-127313

Problem:
move pq_api to uapi path

Solution:
move pq_api to uapi path

Verify:
verify on t5m

Change-Id: I253a8fce92feb84b630ea5d1199b2b1c724b57b3
Signed-off-by: yufei.huan <yufei.huan@amlogic.com>
2023-08-18 00:23:39 -07:00
Gaowei Zhao 711cf53fd3 hdmirx: Android-U implement new hal IHdmiConnection [1/1]
PD#SWPL-130241

Problem:
not support setHpdSignal and getHpdSignal

Solution:
provide 2 ioctrl commands to setHpdSignal and getHpdSignal

Verify:
ohm

Change-Id: I8d2844b492b8e788388e3d1e7e25994bea14b4b8
Signed-off-by: Gaowei Zhao <gaowei.zhao@amlogic.com>
2023-08-15 20:08:38 -07:00
yaoyu.xu a9b6f6943b hdmirx: default close 5v wake up [1/1]
PD#SWPL-127580

Problem:
need close 5v wake up function.

Solution:
add ctl to open/close 5v wake up function.

Verify:
txhd2.

Change-Id: Ib61e5c75d1f3c5560dbb4f286b0d2319bcf4e1c8
Signed-off-by: yaoyu.xu <yaoyu.xu@amlogic.com>
2023-08-03 03:58:35 -07:00
donghui.wang 9bdbcbfe4c ldim: add uapi for get bl_matrix [1/1]
PD#SWPL-132375

Problem:
provide uapi for get bl_matrix

Solution:
add ldim uapi

Verify:
t5m

Change-Id: I79206ba1cb28133ece4633817e9a03423796d576
Signed-off-by: donghui.wang <donghui.wang@amlogic.com>
2023-08-03 01:58:40 -07:00
xing.xu 0541849d33 decoder: CF1 Provide UAPI headers for AMSTREAM (DECODER) module [1/1]
PD#SWPL-130933

Problem:
Provide UAPI headers for AMSTREAM (DECODER) module

Solution:
Provide UAPI headers for AMSTREAM (DECODER) module

Verify:
ohm

Change-Id: I943967d8abeba8d88ed2c5a76961b6ddbb227d9b
Signed-off-by: xing.xu <xing.xu@amlogic.com>
2023-08-02 03:32:21 -07:00
haitao.liu 11a126ffde vdin: sync the code from projects to the trunk branch [1/1]
PD#SWPL-133608

Problem:
fixed some issues on projects,need sync back into trunk
1.vdin vf lost when game mode change from game 2 to game 1
cause video freezing
2.keeper failed when using scatter memory
3.The first frame of vdin1 abnormal on g12b
4.latency may unstable in game mode 5,due to CPU schedule
5.vdin write is low priority cause video abnormal in some situation
6.request memory form codec_mm may takes long time cause av out of sync
7.new feature, dmc notifier debug method
8.1440x480p60 and 1440x480p50,vdin and hdmirx repeated decimation cause
video abnormal

Solution:
1.recycle all vf in write mode list when game mode change
2.set the right right hand to mem_handle in vf
3.drop the first frame
4.use one fixed phy address,eliminate software scheduling effects
5.set vdin write priority to super urgent
6.notify app after codec_mm_alloc
7.add dmc notifier debug method
8.1440x480p60 and 1440x480p50,hdmirx do not notify vdin decimation,
and 1440x480p60 and 1440x480p50,hdmirx do not notify vdin decimation

Verify:
t7/t5m

Change-Id: I40d6c56fe64e389e0ee6e493e8b7d1e1503f686b
Signed-off-by: haitao.liu <haitao.liu@amlogic.com>
2023-07-29 23:53:44 -07:00
wenlong.zhang 4b0f486145 drm: add present fence [1/1]
PD#SWPL-131024

Problem:
add present fence

Solution:
add present fence

Verify:
SC2

Test:
DRM-OSD-87

Change-Id: I5050620befa65c6a3dca760753fd2952b7dadf67
Signed-off-by: wenlong.zhang <wenlong.zhang@amlogic.com>
2023-07-24 05:08:13 -07:00
donghui.wang a981b05b03 ldim: provide UAPI headers for ldim module [1/1]
PD#SWPL-127300

Problem:
provide uapi headers for user space

Solution:
add ldim uapi headers

Verify:
kernel5.15

Change-Id: I2f9cf0c3be16a0e1569da366d72d0924d0a8f85d
Signed-off-by: donghui.wang <donghui.wang@amlogic.com>
2023-07-17 01:41:58 -07:00
Gaowei Zhao ae714d0a06 hdmirx: move hdmirx ioctls to uapi [1/1]
PD#SWPL-129885

Problem:
move hdmirx ioctls to uapi

Solution:
move hdmirx ioctls to uapi

Verify:
T5W

Change-Id: Ic5be1de48c39e3cb05925dd87ce4241c99f08d07
Signed-off-by: Gaowei Zhao <gaowei.zhao@amlogic.com>
2023-07-11 23:18:51 -07:00
yuhua.lin 67a433c8c6 video: provide UAPI headers for video module [1/1]
PD#SWPL-129892

Problem:
provide UAPI headers for video module

Solution:
provide UAPI headers for video module

Verify:
T3

Change-Id: I62453993dfc5c9a57abd9e5e5276156001ae48ac
Signed-off-by: yuhua.lin <yuhua.lin@amlogic.com>
2023-07-09 15:08:54 -07:00
shaochan.liu b5ab39b2b5 lcd: provide UAPI headers for lcd module [1/1]
PD#SWPL-127314

Problem:
provide uapi headers for user space

Solution:
add lcd uapi headers

Verify:
kernel5.15

Change-Id: Ia2fdd6b0b50ecdfbe31049b21b2b1cd6f90d833a
Signed-off-by: shaochan.liu <shaochan.liu@amlogic.com>
2023-07-04 07:07:44 -07:00
qirong.li 93285fd8b5 amvecm: Dual-screen PQ adjustment function [1/1]
PD#SWPL-127748

Problem:
Dual-screen PQ adjustment requires two sets of parameters

Solution:
Add the appropriate control interfaces and processes

Verify:
t7

Change-Id: I8cd2412173ddc0670cded55576a3cf4f057cb510
Signed-off-by: qirong.li <qirong.li@amlogic.com>
2023-06-27 03:21:14 -07:00
jinbing.zhu bb8b285a8d amvecm: 5.15 amvecm move to uapi [1/1]
PD#SWPL-127277

Problem:
move amvecm to uapi path

Solution:
move amvecm to uapi path

Verify:
verify on s5

Change-Id: Idd9e92694877a735e255562c28f6395816f711b6
Signed-off-by: jinbing.zhu <jinbing.zhu@amlogic.com>
2023-06-19 07:29:40 -07:00
Cheng Wang 0898ca7c13 frc: provide UAPI headers for frc module [1/1]
PD#SWPL-127301

Problem:
provide UAPI headers for frc module

Solution:
provide UAPI headers for frc module

Verify:
T3X

Change-Id: I22f5dbaaba6e6e4f0ed663781161a3c2455da596
Signed-off-by: Cheng Wang <cheng.wang@amlogic.com>
2023-06-16 01:25:57 -07:00
qiang.liu 7ddf254c78 vdin: add get vdin status [1/1]
PD#SWPL-127812

Problem:
vdin not support get vdin status

Solution:
add get vdin status

Verify:
t5m

Change-Id: Ie41ec7931b942493bf214ec1b9f426fe28bd80ca
Signed-off-by: qiang.liu <qiang.liu@amlogic.com>
2023-06-14 08:56:21 -07:00
Lei Yang b3eaeb1717 hdmirx: modify 420 configuration for t3x [1/1]
PD#SWPL-125131

Problem:
color is abnormal under 420 format

Solution:
add new setting for t3x 420 mode

Verify:
T3X

Change-Id: I8a9ab78bed3f1afb3560512294f0a166145b926f
Signed-off-by: Lei Yang <lei.yang@amlogic.com>
2023-05-26 07:43:27 -07:00
chen.wang1 d6aa321845 drm: implement video fence ioctl [1/3]
PD#SWPL-124599

Problem:
Unable to obtain video fence.

Solution:
implement video fence ioctl.

Verify:
t3x

Test:
DRM-OSD-65

Change-Id: Idf779bbccc05b08786ffbeebe27cd10aa80be682
Signed-off-by: chen.wang1 <chen.wang1@amlogic.com>
2023-05-25 05:28:07 -07:00
haitao.liu d9cb055a6a vdin: t3x silicon bringup.patch 1 [1/1]
PD#SWPL-117268

Problem:
continue validation

Solution:
1.afbce
2.dual hdmi input
3.vdi6 input
4.hist
5.black bar detect

Verify:
T3x

Change-Id: Ib0492983915f7e00c4b35c959b309bf6643599ef
Signed-off-by: haitao.liu <haitao.liu@amlogic.com>
2023-05-18 21:08:40 +08:00
haitao.liu 36a9e41fc4 vdin: t3x silicon bringup [1/1]
PD#SWPL-117268

Problem:
t3x silicon bringup

Solution:
add vdin on t3x

Verify:
T3x

Change-Id: I21847a5e63a1032e813a05bdfe77df8de564dbcd
Signed-off-by: haitao.liu <haitao.liu@amlogic.com>
2023-05-18 21:08:39 +08:00
mingxiu.sun 1bf092bfa7 vdin: provide UAPI headers for vdin module [1/1]
PD#SWPL-117407

Problem:
provide uapi headers for user space

Solution:
add vdin uapi headers

Verify:
kernel5.15

Change-Id: I3b7a18aac89a6e0f750ff92996e522d2308de4c5
Signed-off-by: mingxiu.sun <mingxiu.sun@amlogic.com>
2023-05-09 05:39:15 -07:00
shufei.zhao 7f2d3ec975 uapi: add license [2/2]
PD#SWPL-113370

Problem:
uapi file is missing a license

Solution:
Add license

Verify:
local

Change-Id: I021e400e794235ea51a1c77edf685d046b0aab9f
Signed-off-by: shufei.zhao <shufei.zhao@amlogic.com>
2023-04-05 22:13:09 -07:00
Liqiang Jin e5eaac6d1e optee: change vmx-socket API from socket to ioctl for kernel 5.15 [1/1]
PD#SWPL-114262

Problem:
selinux blocks the socket

Solution:
change vmx-socket API from socket to ioctl for kernel 5.15

Verify:
Android T + AH212(SC2)

Change-Id: Iba760d5593eed4b73f95add52599cb8342edd67a
Signed-off-by: Liqiang Jin <liqiang.jin@amlogic.com>
2023-03-13 22:46:43 -07:00