Commit Graph

648083 Commits

Author SHA1 Message Date
Hanjie Lin
3f281eedfb vts: aarch32: remove ext2 support [1/1]
PD#SWPL-664

Problem:
32bit_kernel VtsKernelLtp module 6 fail

Solution:
ext2 cause VtsKernelLtp#fs.fs_fill_32bit fail

Verify:
p212 boot normal

Change-Id: Ib3113705939cccffd05ae4adc220b8aa333be4fb
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2018-10-17 18:45:16 -07:00
Dezhi Kong
af669a7801 vlock: fix issue of hdmitx output timing swith [1/1]
PD#174283

Problem:
The display turned blank / black on switching HDMI input sources

Solution:
optimize timing swith check condition

Verify:
verified by r321 board in Android P

Change-Id: If6138794d02e34fcbde8be4a3a4fbcf42b49e85c
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
2018-10-17 16:06:29 +08:00
Evoke Zhang
9c2c0fde7f backlight: ldim: add debug node for tooling [2/3]
PD#169790

Problem:
need tooling api support for ldim driver

Solution:
add debug node for tooling

Verify:
txlx r311

Change-Id: I1937a8154856aa694545ff40d7712132a113b8f3
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-10-17 00:31:12 -07:00
Jiacheng Mei
43052acc27 dts: isp: add multi-sensor support
PD#SWPL-720

Problem:
multi-sensor need config dts

Solution:
add multisensor dts config

Verify:
g12b-skt

Change-Id: I13aa339a54ab33340438d0a2b284c857254ef08b
Signed-off-by: Jiacheng Mei <jiacheng.mei@amlogic.com>
2018-10-17 00:30:42 -07:00
Evoke Zhang
329bc258fd vlock: update lcd vlock parameter flow [1/1]
PD#SWPL-321

Problem:
vlock parameters load fail for lcd unifykey loading is later

Solution:
use queue work to sync lcd unifykey vlock parameters

Verify:
txlx r311

Change-Id: I17fac4ca48fbd8f5b929eccfd38eb7e8a4b5b845
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-10-16 23:47:11 -07:00
Jianxiong Pan
5940d7f258 script: add new check relus in merge_pre_check.pl script [1/1]
PD#174488

Problem:
add some new rules

Solution:
expand the scope of check

Verify:
p212

Change-Id: I4b5428367520456195645dbbce86c5f40411d59a
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2018-10-16 23:27:48 -07:00
jiamin ma
dab56dff36 unifykey: fix wrong KEY_UNIFY_NAME_LEN limit on ARM64_32 platform
PD#SWPL-628

Problem:
The KEY_UNIFY_NAME_LEN limit errorly set to 16 on ARM64_32
platform, for which the correct value is 48

Solution:
Define KEY_UNIFY_NAME_LEN based on the configuration of
CONFIG_ARM64 and CONFIG_ARM64_A32

Verify:
Locally

Change-Id: I93157a907405829b088cb0f7387c1eb90c917188
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
2018-10-16 05:05:41 -07:00
Tao Zeng
659c3e9c36 Merge "interactive: disable idle notifier" into amlogic-4.9-dev 2018-10-16 01:43:29 -07:00
yicheng shen
251912743d hdmirx: fix hdcp2.2 does not work issue
PD#SWPL-308

Problem:
32bit kernel + 32bit userspace,driver needs to use unlocked_ioctl.
Otherwise,IOCTL can not work normally and cause esm init fail.

Solution:
Add unlocked_ioctl handle.

Verify:
Locally

Change-Id: I5a3608088633d89c76c7b7684dc4580d44b77263
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
2018-10-15 23:09:07 -07:00
Yi Zhou
2a6b1f0b9e hdmitx: esm: add unlocked_ioctl in esm [1/1]
PD#SWPL-566

Problem:
hdcp_tx22 can't work with 32bit kernel

Solution
add unlocked_ioctl in esm of 32bit kernel

Verify:
P215

Change-Id: I072abb2ba395c75d92f082ecadcc21e1fefc6f73
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2018-10-16 14:01:41 +08:00
Shunzhou Jiang
cc0f619561 clk: axg: fix 32bit set mpll clk overflow
PD#SWPL-394

Problem:
32bit system clk overflow

Solution:
let mpll clock not overflow

Verify:
gxl

Change-Id: I90c99c026264bb4d6820cd988bd5f8828456e0f6
Signed-off-by: shunzhou.jiang <shunzhou.jiang@amlogic.com>
2018-10-15 22:44:07 -07:00
Jianxin Pan
73d8a197e2 interactive: disable idle notifier
PD#SWPL-569

Problem:
Randomly encountered the phenomenon of kernel panic restart
(add_timer_on) from [<c09acdfc>] (slack_timer_resched+0xa8/0xdc)
(slack_timer_resched) from [<c09ae2f0>] (cpufreq_interactive_start+0xac/0x234)
(cpufreq_interactive_start) from [<c09a8168>] (cpufreq_start_governor+0x68/0xa4)
(cpufreq_start_governor) from [<c09a9e9c>] (cpufreq_online+0x4f8/0x794)
(cpufreq_online) from [<c09aa150>] (cpuhp_cpufreq_online+0x18/0x20)
(cpuhp_cpufreq_online) from [<c03231b8>] (cpuhp_invoke_callback+0xa8/0x638)
(cpuhp_invoke_callback) from [<c0323898>] (cpuhp_up_callbacks+0x34/0xe8)
(cpuhp_up_callbacks) from [<c0324774>] (cpuhp_thread_fun+0x13c/0x14c)
(cpuhp_thread_fun) from [<c034ab64>] (smpboot_thread_fn+0x1a8/0x32c)
(smpboot_thread_fn) from [<c0346428>] (kthread+0x124/0x140)
(kthread) from [<c03089d0>] (ret_from_fork+0x14/0x24)


Solution:
disable idle notifier for interactive

Verify:
verified by p212

Change-Id: I412dab961f04bea439d5a26564268289fc4b3940
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2018-10-15 18:39:36 -07:00
Luan Yuan
0f59b37c5e dtsi: dtbo: change dto partition name to dtbo [1/1]
PD#173146

Problem:
All devices launching with Android 9 must use dtbo partition
and previous leave out curie dtsi

Solution:
Android P request device tree overlay partition name is dtbo

Verify:
verified by p241

Change-Id: If3067ef4d67c7b692668f28b3e5a2233ea393a1a
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2018-10-15 05:33:34 -07:00
Jianxiong Pan
c08c90524f Revert "script: add new check rules in merge_pre_check.pl script [1/1]"
This reverts commit 57728014ee.


Change-Id: Ia803a24fe6b6abd00d4015bb1e6857c2826efac7
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2018-10-15 05:10:38 -07:00
Jianxiong Pan
57728014ee script: add new check rules in merge_pre_check.pl script [1/1]
PD#174488

Problem:
some new rules should be added to the check scripts

Solution:
call the git_msg_check.sh script directly

Verify:
p212

Change-Id: I67c6515038ca2817236e63b4c9f4239583a20613
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2018-10-15 04:49:28 -07:00
Lei Qian
a9f42ab19f cts: dts: add dummy battery driver for TV [1/1]
PD#169027

Problem:
some CTS and VTS testcases use the battery information

Solution:
here add a dummy battery for it.
for P, it requires a dummy charger to set the online property to 1.

Verify:
verified by einstein

Change-Id: I78d2cf54904144bb24cd46670aa7377f2055cf55
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
2018-10-15 02:15:57 -07:00
Kuibao Zhang
655155d978 BT: porting cpy 2704
PD#172583: bt power and uart rts

Change-Id: I392b3caf0771c9608d532694ecd16b52dccf05a3
Signed-off-by: Kuibao Zhang <kuibao.zhang@amlogic.com>
2018-10-15 01:06:25 -07:00
Yong Qin
22084c568b hdmi: cec: change cec IP
PD#173638: cec: change cec IP

Change-Id: Ia5ef195a90b272ec74858a7afca0b7959b0c6817
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2018-10-15 15:49:10 +08:00
Jianxiong Pan
fa6fba02af script: allow JIRA BugId check in the merge_pre_check.pl script
PD#174488: add JIRA BugId check in the merge_pre_check.pl script

Change-Id: I32f2fc123041e6c40ce2a5c4208734e11b307fd5
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2018-10-14 23:24:17 -07:00
nengwen.chen
f4176cd13b atv_demod: modify PALM/N's resolution and sound system display error [3/3]
PD#SWPL-434

Problem:
PALM/N's resolution and sound system display error

Solution:
modify PALM/N's resolution and sound system display error
PALM: 480i PALN: 576i

Verify:
verified by einstein

Change-Id: I2271222634fb5d382aebff31289ab22ddb443bc3
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2018-10-12 21:45:41 -07:00
Nian Jing
cd2fa1d617 vdac: fix crash issue
PD#174269: fix crash issue

Problem:
crash when unplug hdmi.null pointer visiting

Solution:
delete dts config,add null pointer protect

Verify:
test pass on p212

Change-Id: I5176aa4eb398b1bedf14b36ec6529c471e927530
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-10-12 21:37:30 -07:00
Yao.Liu
d6be12ff88 driver: video: fix hdr info not disapear problem [2/2]
PD#173100

Problem:
still show hdr info after switching hdr stream
to non-hdr stream when surface not changed

Solution:
OMX set hdr to decoder, it will be used by amvecm

Verify:
verify by u212

Change-Id: I7d013921fb4124d9aed9f51871253c76c666c022
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
2018-10-12 21:36:12 -07:00
Tellen Yu
48c84bb4f2 dtsi: dtbo: change dto partition name to dtbo [1/2]
PD#173146

Problem:
All devices launching with Android 9 must use dtbo partition

Solution:
Android P request device tree overlay partition name is dtbo

Verify:
verified by p212 board in Android P

Change-Id: If48b6eaf0a0ee2d76a5fb0b58353fb82381c71ee
Signed-off-by: Tellen Yu <tellen.yu@amlogic.com>
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2018-10-12 17:20:31 +08:00
Hanjie Lin
54d0a70c81 dts: arch32: support 32bit g12a bringup [1/1]
PD#169652

Problem:
support 32bit g12a

Solution:
add 32bit dts for g12a
when KERNEL_A32_SUPPORT=true kernel 32bit build,
otherwise kernel 64bit build defaultly.

Verify:
u212 can boot to console, but surfaceflinger can't work

Change-Id: Ia3e92267afbaaa069f3658a101756e4034d08b4d
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2018-10-12 01:28:51 -07:00
shuanglong.wang
048afccfd2 amdolby_vision: fix kernel crash [1/1]
PD# 173406

Problem:
kernel crash when play dv after insmod 4.9 stb dovi.ko at t962x-r311 platform
[  118.398098@0] Internal error: Oops: 96000047 [#1] PREEMPT SMP
[  118.440794@0] CPU: 0 PID: 2869 Comm: irq/40-vdec-0 Tainted: GO    4.9.113 #2
[  118.448726@0] Hardware name: Amlogic (DT)
[  118.452694@0] task: ffffffc01ae2b700 task.stack: ffffffc023e4c000
[  118.458740@0] PC is at __memcpy+0x110/0x180
[  118.462878@0] LR is at dolby_vision_parse_metadata+0xb3c/0x1920
[  118.468736@0] pc : [<ffffff800947c690>] lr : [<ffffff800998b33c>]pstate: 200001c5
[  118.476239@0] sp : ffffffc027e3fb30

Solution:
fix vmalloc error, function pointer add protection

Verify:
need verify at t962x-r311 platform

Change-Id: I3f0872480dabbf8b415d798d6b205028f08fd89a
Signed-off-by: shuanglong.wang <shuanglong.wang@amlogic.com>
2018-10-11 22:37:20 -07:00
Lianlian Zhu
3413ce1850 audio: add 9015s module for 32bit system[1/1]
PD#SWPL-509

Problem:
DAI link has no CODECs because of
configuration has no 9015s codec module.

Solution:
add 9015s module for configuration

Verify:
verified by p321

Change-Id: I448144bdc392dba1c528b41e37a9388c5343d7ec
Signed-off-by: Lianlian Zhu <lianlian.zhu@amlogic.com>
2018-10-11 22:32:21 -07:00
jiamin ma
873f0de57e 32bit: enable running 32bit OS on AXG platforms [1/3]
PD#SWPL-513

Problem:
AXG platforms does not support running 32bit kernel

Solution:
Since kerenl already support build 32bit kernel for
64bit SOC, we only need new dts and configs for it
This patch adds DTS for 32bit kernel of S420 and S
400

Verify:
verified locally on S400 and S420

Change-Id: I47d3cb3a35a00d5450d978ba65af540edc601619
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
2018-10-11 19:23:05 -07:00
Evoke Zhang
783b7b4e7d lcd: unify extern driver struct and flag [2/2]
PD#173257: lcd: unify extern driver struct and flag
include:
1.lcd_extern
2.mipi
3.bl_extern
4.bl_ldim

Change-Id: Ibfd81423151bcefe5ca1c85d442ce029af5b54b7
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-10-11 19:03:33 -07:00
Lei Qian
ffd89f6c33 dts: tv: optimize ion and codec_mm_cma usage [1/1]
PD#SWPL-334

Problem:
gfx graphics test fail caused by low memory

Solution:
enlarge ion and reduce codec_mm_cma

Verify:
verified by p321

Change-Id: I8dc3bfa35a4093199291f21ed0c80ce51e38ea81
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
2018-10-11 07:24:02 -07:00
Evoke Zhang
7a6884e2aa lcd: axg: update gp0_pll range for mipi-dsi usage [2/2]
PD#173483: lcd: axg: update gp0_pll range for mipi-dsi usage

Change-Id: I7db9efef0b646665dae12c84ba3aacf53fb95bcc
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-10-11 03:41:59 -07:00
xuhua zhang
f4ea99506d vdin: perfecting vdin_shutdown() interface
PD#173740: vdin: perfecting vdin_shutdown() interface

Free vdin resource when the system shutdown but the application program
was not close vdin at some fortuitous event.

Change-Id: I343e1b93c6e2166a247592d8faa39b3f737f91d0
Signed-off-by: xuhua zhang <xuhua.zhang@amlogic.com>
2018-10-11 03:28:07 -07:00
Bencheng Jing
7af62acb38 amvecm: read gamma in strings form to match gamma tool
PD#171061: amvecm: read gamma in strings form

Change-Id: I89d45be748288d0ef1fc72e0f4ab34c2c77d920a
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-10-11 03:27:51 -07:00
Yi Zhou
0dca022181 dv: update dv driver for g12a/b
PD#172453:dv: update dv driver for g12a/b

Change-Id: I16eafc1f09d72ade66d0a3d5bef199edf4461fab
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2018-10-11 03:18:34 -07:00
Nian Jing
af75fdfd9a vdac: modify cpu_type definition
PD#174269: modify cpu_type definition

Change-Id: I2f2bfc8f25a1014b623ddd411e997233c2cb0307
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-10-11 10:42:44 +08:00
Nian Jing
42def0031c vdac: get cputype from dts
PD#174269: get cputype from dts

Change-Id: I50e240e8d1f2aa275a2c215989e02e8b51cb6738
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-10-10 03:43:25 -07:00
Jihong Sui
cb56da4fc1 di: fix 4K black screen issue
PD#162632: di: fix 4K black screen issue

1. this is a patch for afbc;
2. close afbc for di temporary;

Change-Id: Ic70cb526dab431ef7caf827c322efe207bb7991f
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
2018-10-09 22:32:18 -07:00
Nan Li
3aad1bd3a7 emmc: optimize tuning opration num
PD#SWPL-421: modify tuning operation num 10->40.

Change-Id: Ife815f6ea2268038884a861ac2dac1931877a762
Signed-off-by: Nan Li <nan.li@amlogic.com>
2018-10-09 22:31:06 -07:00
nengwen.chen
e108b7612b atv_demod: fix demod will be unlocked when input frequence offset -0.25MHz [1/1]
PD#173985: fix demod will be unlocked when input frequence offset -0.25MHz

Change-Id: I0f9891c556456a2048d6cc846f0d349edb14a96e
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2018-10-08 23:02:02 -07:00
he.he
09c5d469c3 usb: use-after-free in ffs_epfile_io+0x1c0/0x9b8
PD#174155: the io_data pointer have kfree in ffs_epfile_async_io_complete,
it can't use after that such as (if (io_data->aio)),
and this judgment is changed to if (data_flag>0).

Change-Id: I3b620b69bbf4e8040a43bd2435fdb836e11cc512
Signed-off-by: he.he <he.he@amlogic.com>
2018-10-08 22:52:29 -07:00
rongrong zhou
9c31a64401 video: ignore omx drop frame for dv
PD#173912

If omx_run is set to false and these frames are not dropped, then it
will be stuck at the first second

Change-Id: I629f11b10c25180604fa6e3cdfb858f299cc0e64
Signed-off-by: rongrong zhou <rongrong.zhou@amlogic.com>
2018-10-08 22:50:13 -07:00
Jianxin Pan
ef4f639218 mm: fix 2 MB memory lost problem for arm32
PD#173956

Change-Id: Ie5fe1865a43d343c8a6ba9defe5508b62679fe92
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2018-10-08 19:27:00 -07:00
Jianxin Pan
a5e7822628 ion: fix null page issue in alloc_buffer_page
PD#173802: Panic trace is
[<c011824c>] (dma_cache_maint_page) from [<c0118400>] (arm_dma_sync_single_for_device+0x58/0x60)
[<c0118400>] (arm_dma_sync_single_for_device) from [<c0118f24>] (arm_dma_sync_sg_for_device+0x60/0x8c)
[<c0118f24>] (arm_dma_sync_sg_for_device) from [<c07e52d0>] (ion_pages_sync_for_device+0x108/0x144)
[<c07e52d0>] (ion_pages_sync_for_device) from [<c07e71b4>] (ion_system_heap_allocate+0x38c/0x3bc)
[<c07e71b4>] (ion_system_heap_allocate) from [<c07e4c2c>] (ion_alloc+0x1e4/0x4d8)
[<c07e4c2c>] (ion_alloc) from [<c07e59f0>] (ion_ioctl+0x3b8/0x428)
[<c07e59f0>] (ion_ioctl) from [<c02a9368>] (do_vfs_ioctl+0xc0/0xa34)
[<c02a9368>] (do_vfs_ioctl) from [<c02a9d58>] (SyS_ioctl+0x7c/0x8c)
[<c02a9d58>] (SyS_ioctl) from [<c0108800>] (ret_fast_syscall+0x0/0x48)

Change-Id: I7e94ea05334693b6e9bfcc2400c9f7f3ff26736e
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2018-10-08 19:25:37 -07:00
jiamin ma
6fc382ccb2 printk: fix user fault debug log in disorder issue
PD#154008: the log output is in disorder[2/2]

We should explicitly using pr_cont when try to print continuous
msgs in one line

Change-Id: I0d2f6f462c4b4b95898f9c33a5a1d138030e05e5
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
2018-10-08 13:55:43 +08:00
Shunzhou Jiang
1bc3303562 clk: G12A/G12B: fix gpu clk enable count error [1/1]
PD#173995: fix gpu clk enable count error

Change-Id: I31f7908507ea2cdb76284977cb17fbe3fc68ce5c
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
2018-09-30 07:44:25 -07:00
Jian Cao
23d7e040b2 osd: fix osd coverity error
PD#174272: osd: fix osd coverity error

Change-Id: I7eb1c40b9453f85c618b9bd3f2112eb854ff9ef7
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
2018-09-30 07:41:58 -07:00
Jian Hu
e2ebe8b292 clock: fix coverity warning
PD#174376: clock: fix coverity warning

Fix suspicious implicit sign extension,
val << (shift), the val is defined as u16, after
shift to left,the val maybe overflow, a u32 variable
should instead of "val << (shift)".

Change-Id: I5b481c2b5d249426c20973fb261fb5ba905528f7
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-09-30 19:04:53 +08:00
Jihong Sui
0a3b4b87f5 di: support compress type progressive input
PD#162632: di: support compress input

1. for gxl, txlx, g12a;
2. change di post configuration;

Change-Id: Iff03f0e5bca379d593fade2ba6043538de9c81c7
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
2018-09-29 23:14:10 -07:00
Xing Wang
bf6f44d90c audio: auge: check resample is inited
PD#163795: audio: auge: check resample is inited

Change-Id: Ib6f06f1e6f9d95a03a8ae5f968fd67af8c17f197
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2018-09-30 13:14:57 +08:00
Jian Hu
450bf2094a clock-measure: tl1: add clock measurement support
PD#172587: clock-measure: tl1: add clock measurement support

Change-Id: I14ab8859b205154bb89139e215fef5898efac681
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-09-29 06:05:18 -07:00
Bo Yang
91b9f08333 watchdog: meson: add watchdog support for tl1
PD#172587: watchdog: meson: add watchdog support for tl1

TL1's watchdog is same with G12A.

Change-Id: Iaa8c502e6a8889a33ed2875e7a16cca07873738a
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2018-09-29 06:04:42 -07:00