Commit Graph

34 Commits

Author SHA1 Message Date
Ao Xu 49216de422 meson_tx_connector: add dptx and hdmitx new driver [1/1]
PD#SWPL-220560

Problem:
add dptx and hdmitx new driver

Solution:
add dptx and hdmitx new driver

Verify:
s7d

Test:
DRM-TX-38

Change-Id: I67bd41a05f2a047fdb01dd341e9db85e2ec9fd9a
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2025-07-28 01:20:00 -07:00
Ao Xu b0bd34746d hdmitx: fix header file reference issue in multi directory [1/1]
PD#SWPL-222968

Problem:
same header file compile fail

Solution:
change BUILD.bazel header rules

Verify:
s7d

Test:
DRM-TX-38

Change-Id: I01b36bc3bc6f6d572367ff3ea7ddf1bbfcc8cf9f
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2025-07-16 21:01:11 -07:00
yao zhang1 7ccedacd01 license: Fix amlogic license. [1/1]
PD#SWPL-217731

Problem:
Fix amlogic license.

Solution:
Fix amlogic license.

Verify:
all chip

Test:
license check pass

Change-Id: I05c47245ff58bf92abccaa7ca08a85524d73f924
Signed-off-by: yao zhang1 <yao.zhang1@amlogic.com>
2025-06-23 21:15:59 -07:00
lizhi.hu 0b6ace6a6d eDPtx: add to drm [1/1]
PD#SWPL-198016

Problem:
new eDP driver support on drm

Solution:
add

Verify:
t7_an400

Test:
DRM-OSD-98

Change-Id: I47f39b63e17ad0a05c3e49b7ed072609d0b3cf24
Signed-off-by: lizhi.hu <lizhi.hu@amlogic.com>
2025-06-03 03:24:34 -07:00
ruofei.zhao f7e9a87839 hdmitx: correct the wrong word [1/1]
PD#SWPL-214148

Problem:
bese_refrsh_rate is misspelled

Solution:
bese_refrsh_rate is changed to base_refresh_rate

Verify:
S905X5M

Test:
DRM-TX-147

Change-Id: I90e5a517af3f85f04ab1130422e21ff46f9c6946
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2025-05-25 22:47:17 -07:00
ruofei.zhao be4c65dee2 hdmitx: add hdmitx diagnostic information [1/1]
PD#SWPL-197767

Problem:
need to add hdmitx diagnostic function

Solution:
add hdmitx diagnostic information

Verify:
S905X5M

Test:
DRM-TX-78

Change-Id: I8813659df1a8b6b789adea767aab934cbf68a9b9
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2025-05-19 06:39:51 -07:00
Ao Xu d930ae8639 vout: remove duplicate struct and macro of connector [1/1]
PD#SWPL-210122

Problem:
current connector struct has multi layer definition
some connector type macro is duplicate

Solution:
remove duplicate struct and macro of connector

Verify:
ah212

Change-Id: Ic07a0674833a84b8ce86c174ff701bd97e184ae7
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2025-04-21 23:20:15 -07:00
ruofei.zhao 976731e04f hdmitx: add edid_spinlock protection when updating_hdr_strategy [1/1]
PD#SWPL-206197

Problem:
in update_hdr_strategy, without edid_spinlock protection, it is possible
to obtain the intermediate state information of rxcap

Solution:
add edid_spinlock protection when updating_hdr_strategy

Verify:
S905X5M

Test:
DRM-TX-78

Change-Id: Iad533f4c5bff970637ef0c8568728ce2b75f18bd
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2025-04-17 21:24:23 -07:00
Ao Xu 108425190c hdmitx: add multi instance support [1/1]
PD#SWPL-204166

Problem:
current driver did not support multi instance

Solution:
add multi instance support

Verify:
s7d

Test:
DRM-TX-139

Change-Id: I3b0cc0b08ba01715e2aeacf6efda4e9bdf0f72e5
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2025-03-17 11:19:08 +08:00
lizhi.hu 4e1b09e5cc DisplayPortTX: Sync 5.15 code to 6.12 [1/1]
PD#SWPL-204061

Problem:
bringup

Solution:
sync cl
454074: initial version
503167: driver bug fix
506377: isolate driver and interface IP ctrl
513041: revert crtc_sel for dptx
513081: remove multi vout server regist

Verify:
t7_an400

Change-Id: I6f7afdfea1258f6802fc22a16b60d0de1bcec581
Signed-off-by: lizhi.hu <lizhi.hu@amlogic.com>
2025-03-13 00:31:55 -08:00
congyang.huang 331cad715f vout: dynamic switch viu and connector [1/1]
PD#SWPL-201190

Problem:
vout and drm need to support dynamic switch between viu and connector

Solution:
1.vout add global vout arch
2.vout modify vout_func_validate_vmode func to find vout_server by
connector_type and mode_name
3.drm support dynamic switch

Verify:
t7c s6

Test:
DRM-OSD-44

Change-Id: I31bd97f42947c6a2db8f0ae5d3ead4af196683e3
Signed-off-by: congyang.huang <congyang.huang@amlogic.com>
2025-02-28 03:47:38 -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
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
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
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
Dezhen Wang bcfa0ee2e4 bring up: revert compatibility code for kernel 6.6 [1/1]
PD#SWPL-151245

Problem:
kernel6.6 will not distinguish different versions of kernel.
so we do not make compatibility code in 6.6.

Solution:
revert compatibility code for kernel 6.6.

Verify:
local

Test:
local

Change-Id: I24b8acac62cec05ffb2f637a86f91789f1d0b905
Signed-off-by: Dezhen Wang <dezhen.wang@amlogic.com>
2024-01-11 18:46:45 -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
zongdong.jiao b74f7746bb hdmitx21: add qms-vrr function [1/1]
PD#SWPL-137039

Problem:
Lack qms-vrr function

Solution:
Add qms-vrr function

Verify:
t7/an400

Test:
DRM-TX-17

Change-Id: I8aff33d9cf2db80c5b82310d8dd4531d5d32b288
Signed-off-by: zongdong.jiao <zongdong.jiao@amlogic.com>
2023-11-03 01:05:11 -07:00
congyang.huang ae3c70a7a2 projector: support txhd2 keystone [1/1]
PD#SWPL-137139

Problem:
not support txhd2 keystone

Solution:
add vpp1 and dummy_p connector to support keystone

Verify:
txhd2

Test:
DRM-OSD-82

Change-Id: I43aa67f39a968255753c882c9ec6b93ae3512900
Signed-off-by: congyang.huang <congyang.huang@amlogic.com>
2023-10-20 06:03:42 -07:00
Ao Xu bcbba76b5e hdmitx: use common api to replace hook interface [1/1]
PD#SWPL-104009

Problem:
drm hdmitx call hook interface

Solution:
use common api to replace hook interface

Verify:
ohm

Test:
DRM-TX-37

Change-Id: Ia29c7f9d6aea9b358053460cdbc6ab99738c984e
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2023-10-04 15:50:29 +08:00
Ao Xu e1c0e5cc79 hdmitx: remove cur_VIC and move vout server to hdmitx common [1/1]
PD#SWPL-137140

Problem:
cur_VIC is not needed
hdmitx20 and hdmitx21 has the same vout api

Solution:
remove cur_VIC and move vout server to hdmitx common
remove pr_fmt

Verify:
ohm

Test:
DRM-TX-33

Change-Id: I981a7769fe1f9f6f562f1814cf19cd5f57535fdc
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
Signed-off-by: zongdong.jiao <zongdong.jiao@amlogic.com>
2023-10-03 19:30:39 +08:00
sky zhou 701d14f09a hdmitx: move common hwop and sysfs [1/1]
PD#SWPL-104015

Problem:
tx20/tx21 have similar functions for
sysfs and hwop.

Solution:
move to hdmitx_hw_common and hdmitx_sysfs_common

Verify:
ohm/t7

Test:
DRM-TX-36

Change-Id: I0638bfe263c07589716da467f251a279582bcda6
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
2023-10-03 09:09:53 +08:00
sky zhou 61d4d1bba3 hdmitx: add struct tx20_hw and tx21_hw [1/1]
PD#SWPL-104011

Problem:
hdev has some hw related members and
hdev is still be used in hdmitx_hw level.

Solution:
abstract tx20_hw/tx21_hw

Verify:
verify on ohm/t7

Test:
DRM-TX-33

Change-Id: Ic0e3867af7894fcdcd50a3a4fe234156e2ef821d
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
2023-09-29 16:49:35 +08:00
Ao Xu b14d7a863f hdmitx: move mode set to hdmitx common [1/1]
PD#SWPL-98751

Problem:
hdmitx20 and hdmitx21 has mode setting flow

Solution:
unify hdmitx20 and hdmitx21 mode setting flow

Verify:
verify on ohm

Test:
DRM-TX-30

Change-Id: Ib279b25796a98f29b59037c1f874c1a2a4a09dd6
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2023-09-20 01:29:00 -07:00
Ao Xu a1e427dcee drm: add drm hdmitx connector state support [1/1]
PD#SWPL-134988

Problem:
add drm hdmitx connector state

Solution:
add drm hdmitx connector state

Verify:
ohm

Test:
DRM-TX-29

Change-Id: I469bf776428ef6015fae0cbcca1675adc4bb8e7c
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2023-09-08 02:28:44 -07:00
sky zhou 6243bb1b5a hdmitx: update struct hdmi_timing for tx20 [1/1]
PD#SWPL-124461

Problem:
hdmi_cea_timing is different from hdmi_timing.

Solution:
sync from tx21 timing, and mark some members
as deprecated.

Verify:
verify on ohm.

Test:
DRM-TX-17, DRM-TX-19, DRM-TX-8

Change-Id: I8dcbf5cd6749eb9c5adb77cf20ad9c9024ac5f11
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
2023-07-09 15:07:47 -07:00
congyang.huang 05e17af59a drm: kernel 5.15 get and set allm mode [1/1]
PD#SWPL-93711

Problem:
get and set allm mode

Solution:
get and set allm mode

Verify:
sc2

Test:
DRM-TX-23

Change-Id: Ic3edb53c2e197f3a56dd2eaf32269532f9b73d58
Signed-off-by: congyang.huang <congyang.huang@amlogic.com>
2023-06-13 21:00:22 -07:00
wenlong.zhang 1b8d3759df drm: add dummy_l connector [1/1]
PD#SWPL-53562

Problem:
add dummy_l connector

Solution:
add dummy_l connector

Verify:
sc2

Test:
DRM-OSD-66

Change-Id: Icdabe39ca5911428f1d6323160852dddb3327d2a
Signed-off-by: wenlong.zhang <wenlong.zhang@amlogic.com>
2023-06-06 20:58:39 -07:00
Wenjie Qiao e8bc8efa30 hdmitx21: s5 bringup for 5.15 [1/1]
PD#SWPL-108774

Problem:
5.15 not support s5

Solution:
add s5 support for 5.15

Verify:
s5

Test:
DRM-TX-17

Change-Id: I6d53e50dad65b95cb48b037091072fa8f5e96e27
Signed-off-by: Wenjie Qiao <wenjie.qiao@amlogic.com>
2023-04-15 08:59:04 +08:00
mingyang.he c86a3389f8 drm: modify typo [1/1]
PD#SWPL-93173

Problem:
typo check failed

Solution:
modify typo

Verify:
x86_64 GNU/Linux

Change-Id: I8c38ea8dd21f569eb61271ea17bebd1f54a5d6a7
Signed-off-by: mingyang.he <mingyang.he@amlogic.com>
2022-09-22 04:11:37 -07:00
Wenjie Qiao 27e85cf459 hdmitx: 5.4 sync to 5.15 [1/1]
PD#SWPL-93028

Problem:
5.4 sync to 5.15

Solution:
sync 5.15

Verify:
sc2

Change-Id: If761bb0e0201ae6085e3b87f5eeafca9a29a4a75
Signed-off-by: Wenjie Qiao <wenjie.qiao@amlogic.com>
2022-09-09 08:08:29 -07:00
yujun.zhang 54bd40dae9 drm: add drm driver support [1/1]
PD#SWPL-82197

Problem:
no drm driver support

Solution:
add drm driver support

Verify:
ap222

Change-Id: I331a75afe6087278ebf9de27ae36a346539d09a8
Signed-off-by: yujun.zhang <yujun.zhang@amlogic.com>
2022-06-07 04:47:30 -07:00
wanwei.jiang af26eeaf9d media: enable the same config as kernel 5.4 [1/1]
PD#SWPL-77521

Problem:
enable the same config as kernel 5.4

Solution:
enable the same config as kernel 5.4

Verify:
s4d

Change-Id: I73f6eb8a896956337503477f32c218fe465cddda
Signed-off-by: wanwei.jiang <wanwei.jiang@amlogic.com>
2022-04-11 20:57:12 +08:00