Commit Graph

263 Commits

Author SHA1 Message Date
xiang.wu1 484b0c6eda hdmitx: not send hdmi/audio uevent under suspend [1/1]
PD#SWPL-94511

Problem:
under suspend, if send hpd/audio uevent to uplayer
1.there may be mode setting from system
2.audio server and audio_hal will start run,
increase power consumption

Solution:
not send hdmi/audio uevent under suspend

Verify:
ah212

Change-Id: Id49edf49ea287871ca8f1b4e600a494cafa3958d
Signed-off-by: xiang.wu1 <xiang.wu1@amlogic.com>
2023-03-02 05:49:51 -08:00
Hangyu Li 02322b8dc5 tee: integrate tee linux driver 3.18 [1/1]
PD#SWPL-100078
PD#SWPL-100278

Problem:
need to change tdk_linuxdriver to linux kernel

Solution:
update tee driver from linaro-swg/linux upstream
https://github.com/linaro-swg/linux
upstream tag: optee-3.19.0
upstream commit: 29aee39cfa
optee-3.19.0 is almost same with optee-3.18.0

Verify:
Android T + ohm + Kernel 5.15

Change-Id: Ib58f53f50e7b4be3fb87f120a9eceaea0c5803f4
Signed-off-by: Hangyu Li <hangyu.li@amlogic.com>
2023-02-24 03:56:26 -08:00
Evoke Zhang a4c36bfb13 backlight: ldim: update reserved memory init method [1/1]
PD#SWPL-110462

Problem:
local dimming reserved memory can be optimized for 1M size

Solution:
update local dimming reserved memory init method:
flag=1, from ldc_reserved cma
flag=2, from system cma pool
flag=3, from kmalloc

Verify:
at301

Change-Id: I76da0e738dcbcca82ff7d9f51a23e9c79f8f8ed3
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2023-02-23 01:50:28 -08:00
Bin.Wang2 bb3f8563a3 vlock: t5m vlock bringup [1/1]
PD#SWPL-107079

Problem:
t5m vlock pll bringup

Solution:
t5m vlock bringup

Verify:
verify on t5m

Change-Id: I6ac8ee5ecfc0a651482cc3b99a14344c314b074b
Signed-off-by: Bin.Wang2 <bin.wang2@amlogic.com>
2023-02-17 00:07:06 -08:00
jialong.jiang d624f802f5 dv: Kernel5.15 S5 dv. [1/1]
PD#SWPL-110685

Problem:
Kernel5.15 S5 dv.

Solution:
Kernel5.15 S5 dv.

Verify:
sc2.

Test:
dv test ok.

Change-Id: Icd0196dacef028f00157934e1f4ee737ae84ec23
Signed-off-by: jialong.jiang <jialong.jiang@amlogic.com>
2023-02-15 06:10:03 -08:00
zehong.luo 2e2da8e1c9 media: s5 bringup decoder drivers. [1/1]
PD#SWPL-106566

Problem:
s5 media_modules 5.4 code porting to media_modules 5.15
- Kernel - Media driver

Solution:
add AVS3 format define

Verify:
s928x

Change-Id: Ib92699fafe1e4c7ef29275f7449a2e2166a89c43
Signed-off-by: zehong.luo <zehong.luo@amlogic.com>
2023-02-15 06:09:55 -08:00
chen.xu b1dc84744a video_processor: sync code from 5.4 to 5.15 [1/1]
PD#SWPL-110999

Problem:
video_processor need sync code from 5.4 to 5.15.

Solution:
1.sync code from 5.4 to 5.15 for video_processor.
2.sync video_processor 5.4 code to 5.15 start commit Ibc1cc32
and end commit I75b5c4.
3.sync vicp end commit I1afb897.
4.except I816b036 other already sync.

Verify:
T7C

Test:
sync code from 5.4 to 5.15 for video_processor

Change-Id: I75387e4e7874a139307a066cf9d24cbb2991e73d
Signed-off-by: chen.xu <chen.xu@amlogic.com>
2023-02-14 19:52:51 -08:00
gerrit autosubmit 7828bc6c8a Merge "dvb_extern: add R856 tuner id (V1.11) [1/1]" into amlogic-5.15-dev 2023-02-13 04:14:37 -08:00
gerrit autosubmit e84311ffa5 Merge "tvp: add cma_mmu_op api for clear or set page pte. [1/1]" into amlogic-5.15-dev 2023-02-13 04:11:29 -08:00
jialong.jiang b70f6e94c6 hdr: Kernel5.15 S5 hdr. [1/1]
PD#SWPL-109811

Problem:
Kernel5.15 S5 hdr.

Solution:
Kernel5.15 S5 hdr

Verify:
sc2.

Change-Id: I60d70b18410bb9b26d21d4de53134ee116d1996f
Signed-off-by: jialong.jiang <jialong.jiang@amlogic.com>
2023-02-12 23:41:21 -08:00
min.yang b10b39fdab dvb_extern: add R856 tuner id (V1.11) [1/1]
PD#SWPL-110885

Problem:
should support cxd2878 and R856.

Solution:
and R856 id.

Verify:
verified sc2.

Change-Id: Ib2da06445a5bf9b5efa44df616179ab7170a08fb
Signed-off-by: min.yang <min.yang@amlogic.com>
2023-02-13 11:24:34 +08:00
Jianxiong Pan 5498b9ad89 tvp: add cma_mmu_op api for clear or set page pte. [1/1]
PD#SWPL-109588

Problem:
serror when access tvp secure area.

Solution:
add page pte operation api.

Verify:
t7c.

Change-Id: I200b9d4fada3c3697caaae0660e0615ebb9beefb
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
Signed-off-by: Hao Shi <hao.shi@amlogic.com>
2023-02-12 18:42:11 -08:00
dongqing.li 5c78a922a7 mm: kernel 5.15 add ramdump driver. [1/1]
PD#SWPL-108700

Problem:
kernel 5.15 cannot support ramdump.

Solution:
support it.

Verify:
sc2_ah212

Change-Id: I9eb56b006ac68ba1350a3183a9617f01e6749e62
Signed-off-by: dongqing.li <dongqing.li@amlogic.com>
2023-02-11 01:27:38 -08:00
dongfei.li e8c0363a5b frc: frc chg reg.h for common using [1/1]
PD#SWPL-110876

Problem:
divide register def for drv

Solution:
divide register def for drv
line length of 113 exceeds 100 columns
which from vlsi code

Verify:
T3

Change-Id: I18d24addd198d39f331da3fdf852d7a4194f69c1
Signed-off-by: dongfei.li <dongfei.li@amlogic.com>
2023-02-10 01:23:33 -08:00
Cheng Wang 5efcc50bb0 frc: frc integrate function of IRQ [1/3]
PD#SWPL-110218

Problem:
1.optimization of the frc algorithm
2.separating table of reg

Solution:
1.Steps to optimize the algorithm
2.separating table of reg

Verify:
T3/T5M-5.15

Signed-off-by: Cheng Wang <cheng.wang@amlogic.com>
Change-Id: I700694f7c326baed95cca64d1ea7eb8dd6d01606
2023-02-08 20:45:34 -08:00
gerrit autosubmit 87494b92ea Merge "hdmitx: adjust avi packet placement [1/2]" into amlogic-5.15-dev 2023-02-02 18:43:55 -08:00
min.yang d322675f14 dvb_extern: optimize attach (V1.10) [1/5]
PD#SWPL-107492

Problem:
should optimize tuner demod attach.

Solution:
attach action call by dvb-extern.

Verify:
verified by T + ohm/smith.

Change-Id: Ie0899a48a97c4904b930a75aa79fef52dd588fe6
Signed-off-by: min.yang <min.yang@amlogic.com>
2023-01-30 14:14:01 -08:00
Evoke Zhang 3cffb31132 lcd: optimize config probe workqueue [1/1]
PD#SWPL-106857

Problem:
msleep in workqueue maybe block some progress

Solution:
1.change workqueue+msleep loop to delay_work nested calling
2.change lcd workqueue from highpri to normal

Verify:
ar301

Change-Id: I29fb874b14c29a8c630d4decaeaf97085d6d7d40
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2023-01-16 22:23:53 -08:00
gerrit autosubmit 5853ad1707 Merge "kernel: 5.15 algorithm makefile and kconfig new paths [1/1]" into amlogic-5.15-dev 2023-01-14 00:27:16 -08:00
xiang.wu1 83ce962c0e hdmitx: adjust avi packet placement [1/2]
PD#SWPL-108377

Problem:
when connected Sony KD-55X9500G, it will
keep flash screen when output 480p60hz
y444/rgb,10bit + HDR

Solution:
adjust avi packet placement, change from
line 10 to the vertical blanking when
first line with active Vsync appears.

Verify:
ohm

Change-Id: I6bf1c35619e9b52524271b40881b5cbb60fc55ee
Signed-off-by: xiang.wu1 <xiang.wu1@amlogic.com>
2023-01-13 16:03:53 +08:00
jinbing.zhu 25cdf9fca1 kernel: 5.15 algorithm makefile and kconfig new paths [1/1]
PD#SWPL-96505

Problem:
fix path

Solution:
fix path

Verify:
A311D2-AN400

Change-Id: I61c72c28ea165d6e91c5105d72c1a7593ca09a1e
Signed-off-by: jinbing.zhu <jinbing.zhu@amlogic.com>
2023-01-12 22:37:13 -08:00
gerrit autosubmit 1181570a50 Merge "v4lvideo: fix vdin buffer keep fail [1/1]" into amlogic-5.15-dev 2023-01-12 18:22:21 -08:00
hang cheng 6f3bc21cfd hdmitx21: add support for 480i/576i [1/2]
PD#SWPL-107826

Problem:
1.can't output 480i/576i normally, the VENC_DVI
and VENC_DE registers that is used to configure
output format to hdmi input is not configured
2.no pix_repeat_factor for chips >= T7

Solution:
1.configure VENC_DVI and VENC_DE registers
for 480i/576i
2.add pix_repeat_factor for chips >= T7

Verify:
ax201

Change-Id: I916465cca69bf248b9ae1dded23e34a4939b01f6
Signed-off-by: hang cheng <hang.cheng@amlogic.com>
2023-01-12 00:03:24 -08:00
Yao Jie 2b31d6669b reboot: extend reboot reason index to 128 [8/8]
PD#SWPL-100550

Problem:
Need to extend reboot reason index to 128 for
some chip like SC2/S4/T3/T7, etc.

Solution:
Add another 4 bits of sticky register for reboot
reason index storage, this will extend reboot
reason to 128 (0 ~ 127)

Verify:
SC2-AH212

Change-Id: Ia756d7640dc7caf0132c66b55deb0c263e198f3d
Signed-off-by: Yao Jie <jie.yao@amlogic.com>
2023-01-11 22:10:28 -08:00
jintao xu 1589fa13ae v4lvideo: fix vdin buffer keep fail [1/1]
PD#SWPL-105526

Problem:
vdin buffer keep fail

Solution:
vdin buffer use codec_mm type keep

Verify:
T3

Change-Id: I0ba964e17c5988efcd4da89dff2da644078515fc
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
2023-01-12 11:02:48 +08:00
Pengcheng Chen 7dc834d9a9 vpp: add vpu Qos urgent set [1/1]
PD#SWPL-108065

Problem:
t5m default vpu Qos urgent set is low

Solution:
1.add vpu Qos urgent set
2.set vpu0/vpu2 Qos super urgent

Verify:
t5m

Change-Id: I5da39853ed802bb84ee3a45a38e5502fd6c09678
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2023-01-11 03:29:05 -08:00
MingLiang Dong ce4549a6be amvecm: fix eye protect convert for stb [1/1]
PD#SWPL-104526

Problem:
because stb eye protect coefficient is 3x3 matrix

Solution:
calculate output with 3x3 matrix coefficient

Verify:
sc2

Change-Id: I3dc823aa4d2ad8efffb1873d04a762e90d1895a6
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2023-01-10 00:31:31 -08:00
donghui.wang f43e5c6192 ldim: sync code from k5.4 to k5.15 [1/2]
PD#SWPL-106866

Problem:
sync code from k5.4 to k5.15

Solution:
sync

Verify:
t5m

Change-Id: I382a6b4f29260ffbeb9380c262c679c35b41adde
Signed-off-by: donghui.wang <donghui.wang@amlogic.com>
2023-01-09 21:16:36 -08:00
Jianxiong Pan 4155373e45 mm: add dma_pcie_ops for pcie whitelist. [1/1]
PD#SWPL-103303

Problem:
restrict pcie access to fixed area memory.

Solution:
add dma_pcie_ops for pcie whitelist.

Verify:
t3_ar321.

Change-Id: I1a2f8146359e403a706d640eb4674f959c35b839
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2023-01-07 06:19:05 -08:00
Pengcheng Chen 211d4bc927 vpp: sync video_sink related code from 5.4 [1/1]
PD#SWPL-105863

Problem:
sync video_sink related code from 5.4

Solution:
sync video_sink related code from 5.4

Verify:
t7c

Change-Id: Idff75648ac2b3d9e0302f0ae8d758627a62022d8
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2023-01-06 08:16:50 -08:00
junyi.zhao d86df601fb pwm: optimize [1/1]
PD#SWPL-99829

Problem:
need to optimize pwm code

Solution:
fix clk get/set rate problem in  irq
add pwm get state func

Verify:
sc2_ah212
t7_an400
t5m_ay301

Change-Id: Ib1a2ba64c6066409bbc66b03b0bae9df89fbdcd0
Signed-off-by: junyi.zhao <junyi.zhao@amlogic.com>
2023-01-05 08:03:55 -08:00
nengwen.chen 6f8b6c0f47 dtv_demod: fix s ber and adc fga gain and atsc ch if (V1.1.74) [1/1]
PD#SWPL-92501

Problem:
fix s ber and adc fga gain and atsc ch if.

Solution:
fix s ber(x1e7).
fix s adc fga gain(different gains are used depending on the tuner type).
fix DTV_TS_INPUT.
fix atsc ch if setting(compatible with R842 5M and 4.57M IF)
The ACI can be improved by using 4.57M.
fix j83b if agc target.
AMLDTVDEMOD_VER "V1.1.74".

Verify:
verify by T5D/S4D.

Change-Id: I451eac3e3d07e13824e24e95629e4985dbc72192
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2023-01-05 02:07:48 -08:00
dongfei.li 473db87699 frc: frc chg init table and fixed power set [2/3]
PD#SWPL-106844

Problem:
t5m_init

Solution:
t5m_init

Verify:
t5m

Change-Id: I106776190d1971fc948b0a60ca5c7fd8cb3ccf5c
Signed-off-by: dongfei.li <dongfei.li@amlogic.com>
2023-01-05 00:07:50 -08:00
xinli.gao c4bd10f808 GPU: provide an api to allocate memory from a fixed area [1/1]
PD#SWPL-106500

Problem:
want to allocate memory from a fixed area in asymmetric system.

Solution:
declare cma area in asymmetric memory, and provide api

Verify:
t5m

Change-Id: I785e95a7f01ceff3a135b65c012ddb0b94be92da
Signed-off-by: xinli.gao <xinli.gao@amlogic.com>
2023-01-04 22:24:58 -08:00
Cheng Wang cbc64b0bb6 frc: modify buf of me compress [1/1]
PD#SWPL-106293

Problem:
frc init for t5m

Solution:
frc init for t5m

Verify:
T5M

Change-Id: Idd8b9d50c3a1693115f88330d941d10a31a2ee7f
Signed-off-by: Cheng Wang <cheng.wang@amlogic.com>
2023-01-04 01:07:23 -08:00
Brian Zhu db4d609728 vpp: sync over sync fixing from 5.4 [1/1]
PD#SWPL-106852

Problem:
Need add over vsync check

Solution:
Add protection for over vsync issue

Verify:
Vefified on t3

Change-Id: I873ee322996cf91671e9122dbfd1c23fe0fe1d59
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2022-12-31 08:11:19 -08:00
jintao xu 6344d06ab7 vc: fix vf->repeat_count[2] out of bounds [1/1]
PD#SWPL-105340

Problem:
panic when vf->repeat_count[2] out of bounds

Solution:
fix vf->repeat_count[2] out of bounds

Verify:
T7C

Change-Id: I1add92e74623deea9c5df24a85905eb9cd5bb74f
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
2022-12-31 06:19:36 -08:00
chen.xu 3045b80992 video_processor: sync code from 5.4 to 5.15 [1/1]
PD#SWPL-106614

Problem:
video_processor need sync code from 5.4 to 5.15.

Solution:
1.sync code from 5.4 to 5.15 for video_processor.
2.sync 5.4 code to 5.15 start commit Idee4fb
and end commit I67fa2f.
3.except I2e4c3e other already sync.

Verify:
T7C

Test:
sync code from 5.4 to 5.15 for video_processor

Change-Id: I41070cb1bd0960f0c29b6d28a9d7677febde6c7a
Signed-off-by: chen.xu <chen.xu@amlogic.com>
2022-12-31 06:19:31 -08:00
xiang.wu1 4166820b47 hdmitx: slab out of bounds [1/1]
PD#SWPL-106184

Problem:
slab out of bounds in hdmitx setup attr

Solution:
add protection in hdmitx setup attr

Verify:
s905x4

Test:
DRM-TX-17

Signed-off-by: xiang.wu1 <xiang.wu1@amlogic.com>
Change-Id: Ib79a6e9eb4f6059a4641a72c6ccfb330c4daeaa6
2022-12-31 06:19:24 -08:00
dongfei.li 0e4f5324b1 frc: frc add power domain [1/1]
PD#SWPL-106597

Problem:
t5m add power domain

Solution:
t5m add power domain

Verify:
T5M

Change-Id: Icb8cc4928a434129b509bcd5ccf178bc2ae13853
Signed-off-by: dongfei.li <dongfei.li@amlogic.com>
2022-12-30 17:18:41 +08:00
MingLiang Dong 31158eb0b4 amvecm: t5m bringup [1/1]
PD#SWPL-101964

Problem:
t5m bringup

Solution:
t5m bringup

Verify:
verify on t5m

Change-Id: Ia0f8c96dafe9b66576b18d1a5f1787d39309072a
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
Signed-off-by: chen.xu <chen.xu@amlogic.com>
2022-12-30 17:18:40 +08:00
hang cheng 303a10e39c hdmitx: optimise log of hdmi [1/1]
PD#SWPL-103011

Problem:
need to optimise log print

Solution:
optimise log, set low print level
for some low important information,
enable DEBUG macro to enable pr_debug

Verify:
ah212

Test:
on ah212, check log of boot up and hotplug

Change-Id: I65cc454ffd652555a4302b75b39a9078ce2d1fb6
Signed-off-by: hang cheng <hang.cheng@amlogic.com>
2022-12-29 00:41:03 -08:00
xujin.hu 000096e640 hdmitx: typocheck for kernel 5.15 secondly [1/1]
PD#SWPL-103534

Problem:
code style and spell incorrection of hdmitx

Solution:
typo check

Verify:
T7

Change-Id: Ib2f5a3629da0fee17463d9fd8352b6e02181e2dc
Signed-off-by: xujin.hu <xujin.hu@amlogic.com>
2022-12-28 02:48:01 -08:00
Hanjie Lin caa8b668c5 debug: gki optimize [2/4]
PD#SWPL-99365

Problem:
gki optimize

Solution:
1, code optimize
2, watchdog_hld to ko

Verify:
sc2_ah212

Change-Id: Ibb1b16bd61d794defb39d53f17ad86179ba4a661
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2022-12-27 04:32:55 -08:00
Wenjie Qiao 9b5facba10 hdmitx: update bit30 of register HDMIPLL_CTRL3 [2/2]
PD#SWPL-100034

Problem:
The 6G setting of HPLL VOC output as 6.8G, and this will
make the 1080p60hz shift to 70hz

Solution:
1. update bit30 of register HDMIPLL_CTRL3
2. add the test of pixel clkmsr

Verify:
T7/SC2

Change-Id: I1242906f48973d0b82f2276acd2988f3db6371ba
Signed-off-by: Wenjie Qiao <wenjie.qiao@amlogic.com>
2022-12-27 00:30:26 -08:00
gerrit autosubmit 83fee9b1be Merge "amvecm: coverity check modify sync to 5.15 [1/1]" into amlogic-5.15-dev 2022-12-22 22:21:57 -08:00
gerrit autosubmit 8e214d069c Merge "vdin: fix loopback venc0 on s5 issue [1/1]" into amlogic-5.15-dev 2022-12-22 19:06:03 -08:00
Evoke Zhang bd35f5bc7b lcd: enable clk for drm resume [1/1]
PD#SWPL-101375

Problem:
tv mode lcd clk can't enable when display mode set by drm resume

Solution:
enable lcd clk if it is disabled for drm resume

Verify:
ar301

Change-Id: Iae26fdc1722e2e406ee3ed95532aa493ba44acb9
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2022-12-21 08:14:33 -08:00
haitao.liu 3ec3436e79 vdin: fix loopback venc0 on s5 issue [1/1]
PD#SWPL-102175

Problem:
Cannot loopback venc0 on s5

Solution:
modify slice register setting

Verify:
s5

Change-Id: Ie1723db89ba1d94da7cd17f4a0c1cb39488c3138
Signed-off-by: haitao.liu <haitao.liu@amlogic.com>
2022-12-21 22:23:35 +08:00
Xiangyu Cai 0fb60a21a8 amvecm: coverity check modify sync to 5.15 [1/1]
PD#SWPL-101084

Problem:
coverity check problem in 5.4

Solution:
sync the modify to 5.15

Verify:
t982ar301

Signed-off-by: Xiangyu Cai <xiangyu.cai@amlogic.com>
Change-Id: I7bc01812e30cacf4f7b6cb157e1b6aaccee2c6be
2022-12-21 01:07:39 -08:00