Lei Qian [Tue, 16 Oct 2018 12:32:21 +0000 (20:32 +0800)]
dts: sync 1g platform ion and codec_mm_cma with ampere [1/1]
PD#166821
Problem:
34 media CTS fails in einstein
Solution:
enlarge codec_mm_cma to d000000
Verify:
verify by einstein
Change-Id: I026a1ff3e6155324dff1a5b9702c31f19d68a57f
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
jiamin ma [Wed, 5 Sep 2018 07:39:24 +0000 (15:39 +0800)]
debug: show more debug infos when user faults happens
PD#173163: need more debug infos when user faults happens
1. show pfn for all registers;
2. show memory around all registers;
3. show vma maps around pc/lr
Change-Id: I37be84dcba66ce9ce6b60382a49cf6e9afd2bcb9
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
tao zeng [Wed, 17 Oct 2018 09:55:46 +0000 (17:55 +0800)]
mm: show more information when in bad mode [1/1]
PD#154260
Problem:
When bad mode happens, no pfn/far information is printed.
It get's problems to debug.
Solution:
1. Add far as parameter for bad_mode handler
2. Show pfn of all registers for bad_mode
Verify:
Local verified.
Change-Id: I4b0b457eff44ee717094ee8056f96ff16f111139
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
zhiqiang.liang [Wed, 17 Oct 2018 01:24:07 +0000 (09:24 +0800)]
suspend: dts: solve ampere with the kernel 32bit can not enter suspend state issue
PD#SWPL-568
problem:
Ampere P mainline 32bit suspend,the serial port keeps printing
solution:
modify the system sleep parameter
verify:
p212
Change-Id: Id0827c09741a91b1fad8edcac603997e5bfd2880
Signed-off-by: zhiqiang.liang <zhiqiang.liang@amlogic.com>
nengwen.chen [Wed, 17 Oct 2018 09:44:38 +0000 (17:44 +0800)]
atv_demod: ATV sound system cannot be auto detected [1/2]
PD#TV-44
Problem:
ATV sound system cannot be auto detected.
Solution:
Update demod and tuner config after adjust freqency, so that audio can detect.
Verify:
verified by einstein and p321
Change-Id: I8ce70a8f1fd2261c098b7b7f02c93ee061dd52c9
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
Jianxiong Pan [Thu, 18 Oct 2018 06:23:50 +0000 (14:23 +0800)]
script: add new check rules in merge_pre_check.pl [1/1]
PD#174488
Problem:
add some new rules
Solution:
expand the scope of check
Verify:
p212
Change-Id: Ica28adb7ddb43e39cd4570e0338dbd59ec6a42f3
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
Gongwei Chen [Thu, 11 Oct 2018 02:23:58 +0000 (10:23 +0800)]
dts: u212 1g: optimized cma [1/3]
PD#SWPL-492
Problem:
system response is slow
Solution:
optimized cma
Verify:
Verify by franklin 1g
Change-Id: I227fb168fa66566768fd4dbcefcbf100546daabd
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>
Jianxiong Pan [Thu, 18 Oct 2018 01:42:33 +0000 (09:42 +0800)]
script: dd new check rules in merge_pre_check.pl script [1/1]
PD#174488
Problem:
add some new rules
Solution:
strictly check as required
Verify:
p212 pass
Change-Id: Iaa056eece6e9f812751cd585f0b5537476edfab5
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
he.he [Tue, 16 Oct 2018 11:20:23 +0000 (19:20 +0800)]
usb: adb reboot and then adb disconnect[1/1]
PD#174155: complete_ep 0xffffffc05bed2858, ep->queue empty!
Problem:
1. After adb process be killed, data buffer is freed and
this memory is allocated for the other. But the address
is hold by the controller.
2. Adbd in PC is running. So, the controller receive the
data and write to this memory.
3.The value of this memory is modified by the controller.
This could cause the memory problem.
Solution:
whenever io_data->aio equals 1, the data buffer is from a fixed array.
Verify:
verified by huang xiaojing
Change-Id: I2055ea013021c8411bf626ce170e6b32164bef4a
Signed-off-by: he.he <he.he@amlogic.com>
Yue Wang [Wed, 17 Oct 2018 01:54:52 +0000 (21:54 -0400)]
usb: fix deadlock caused by switching usb serial port
PD#174679: usb: Fix deadlock caused by switching usb serial port.
Change-Id: I0bc9bb5d15b5794cfb8e218c03a98c395713e4c0
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
Hanjie Lin [Mon, 15 Oct 2018 11:27:49 +0000 (19:27 +0800)]
perf: aarch32: support arm pmu [1/1]
PD#SWPL-631
Problem:
32bit_kernel CtsSimpleperfTestCases modules 39 fail
Solution:
modify dts for arm pmu
port pmu interrupt issue fixup code
http://scgit.amlogic.com:8080/#/c/47552/
Verify:
p212 perf test ok
Change-Id: Icd31d645c8af0ca64e898251ffe8dbb0469e47e7
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
Hanjie Lin [Wed, 17 Oct 2018 06:36:19 +0000 (14:36 +0800)]
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>
Dezhi Kong [Mon, 15 Oct 2018 06:31:11 +0000 (14:31 +0800)]
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>
Evoke Zhang [Sat, 4 Aug 2018 07:59:25 +0000 (15:59 +0800)]
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>
Jiacheng Mei [Thu, 20 Sep 2018 08:29:28 +0000 (16:29 +0800)]
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>
Evoke Zhang [Fri, 12 Oct 2018 11:43:25 +0000 (19:43 +0800)]
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>
Jianxiong Pan [Wed, 17 Oct 2018 05:59:59 +0000 (13:59 +0800)]
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>
jiamin ma [Mon, 15 Oct 2018 10:02:33 +0000 (18:02 +0800)]
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>
Tao Zeng [Tue, 16 Oct 2018 08:43:29 +0000 (01:43 -0700)]
Merge "interactive: disable idle notifier" into amlogic-4.9-dev
yicheng shen [Mon, 15 Oct 2018 06:06:13 +0000 (02:06 -0400)]
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>
Yi Zhou [Mon, 15 Oct 2018 09:04:10 +0000 (17:04 +0800)]
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>
Shunzhou Jiang [Mon, 15 Oct 2018 02:47:51 +0000 (10:47 +0800)]
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>
Jianxin Pan [Mon, 15 Oct 2018 13:07:36 +0000 (21:07 +0800)]
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>
Luan Yuan [Mon, 15 Oct 2018 05:58:53 +0000 (13:58 +0800)]
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>
Jianxiong Pan [Mon, 15 Oct 2018 12:10:38 +0000 (05:10 -0700)]
Revert "script: add new check rules in merge_pre_check.pl script [1/1]"
This reverts commit
57728014eeca00e12f843b293ce3be51c042450b.
Change-Id: Ia803a24fe6b6abd00d4015bb1e6857c2826efac7
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
Jianxiong Pan [Mon, 15 Oct 2018 08:14:49 +0000 (16:14 +0800)]
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>
Lei Qian [Fri, 12 Oct 2018 13:19:58 +0000 (21:19 +0800)]
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>
Kuibao Zhang [Fri, 7 Sep 2018 07:45:56 +0000 (15:45 +0800)]
BT: porting cpy 2704
PD#172583: bt power and uart rts
Change-Id: I392b3caf0771c9608d532694ecd16b52dccf05a3
Signed-off-by: Kuibao Zhang <kuibao.zhang@amlogic.com>
Yong Qin [Fri, 14 Sep 2018 02:40:54 +0000 (10:40 +0800)]
hdmi: cec: change cec IP
PD#173638: cec: change cec IP
Change-Id: Ia5ef195a90b272ec74858a7afca0b7959b0c6817
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
Jianxiong Pan [Wed, 10 Oct 2018 06:40:28 +0000 (14:40 +0800)]
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>
nengwen.chen [Thu, 11 Oct 2018 02:16:56 +0000 (10:16 +0800)]
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>
Nian Jing [Fri, 12 Oct 2018 09:51:01 +0000 (17:51 +0800)]
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>
Yao.Liu [Thu, 11 Oct 2018 06:49:23 +0000 (02:49 -0400)]
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>
Tellen Yu [Wed, 5 Sep 2018 11:12:03 +0000 (19:12 +0800)]
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>
Hanjie Lin [Fri, 21 Sep 2018 09:31:57 +0000 (17:31 +0800)]
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>
shuanglong.wang [Tue, 2 Oct 2018 07:56:32 +0000 (15:56 +0800)]
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>
Lianlian Zhu [Thu, 11 Oct 2018 08:25:48 +0000 (16:25 +0800)]
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>
jiamin ma [Thu, 11 Oct 2018 02:31:00 +0000 (10:31 +0800)]
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>
Evoke Zhang [Tue, 4 Sep 2018 05:34:38 +0000 (13:34 +0800)]
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>
Lei Qian [Thu, 11 Oct 2018 07:22:06 +0000 (15:22 +0800)]
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>
Evoke Zhang [Tue, 11 Sep 2018 09:31:26 +0000 (17:31 +0800)]
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>
xuhua zhang [Fri, 14 Sep 2018 07:36:46 +0000 (15:36 +0800)]
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>
Bencheng Jing [Thu, 27 Sep 2018 12:00:17 +0000 (20:00 +0800)]
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>
Yi Zhou [Tue, 9 Oct 2018 06:33:25 +0000 (14:33 +0800)]
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>
Nian Jing [Thu, 11 Oct 2018 02:42:33 +0000 (10:42 +0800)]
vdac: modify cpu_type definition
PD#174269: modify cpu_type definition
Change-Id: I2f2bfc8f25a1014b623ddd411e997233c2cb0307
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
Nian Jing [Thu, 27 Sep 2018 05:32:14 +0000 (13:32 +0800)]
vdac: get cputype from dts
PD#174269: get cputype from dts
Change-Id: I50e240e8d1f2aa275a2c215989e02e8b51cb6738
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
Jihong Sui [Thu, 4 Oct 2018 04:42:18 +0000 (12:42 +0800)]
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>
Nan Li [Tue, 9 Oct 2018 05:08:05 +0000 (13:08 +0800)]
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>
nengwen.chen [Sat, 29 Sep 2018 03:14:51 +0000 (11:14 +0800)]
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>
he.he [Wed, 26 Sep 2018 06:47:27 +0000 (14:47 +0800)]
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>
rongrong zhou [Tue, 25 Sep 2018 05:57:05 +0000 (13:57 +0800)]
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>
Jianxin Pan [Tue, 18 Sep 2018 06:49:06 +0000 (14:49 +0800)]
mm: fix 2 MB memory lost problem for arm32
PD#173956
Change-Id: Ie5fe1865a43d343c8a6ba9defe5508b62679fe92
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
Jianxin Pan [Wed, 19 Sep 2018 11:08:29 +0000 (19:08 +0800)]
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>
jiamin ma [Mon, 8 Oct 2018 03:16:00 +0000 (11:16 +0800)]
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>
Shunzhou Jiang [Wed, 16 May 2018 06:24:34 +0000 (14:24 +0800)]
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>
Jian Cao [Sat, 29 Sep 2018 01:46:57 +0000 (09:46 +0800)]
osd: fix osd coverity error
PD#174272: osd: fix osd coverity error
Change-Id: I7eb1c40b9453f85c618b9bd3f2112eb854ff9ef7
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
Jian Hu [Sun, 30 Sep 2018 07:53:28 +0000 (15:53 +0800)]
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>
Jihong Sui [Mon, 17 Sep 2018 07:47:41 +0000 (15:47 +0800)]
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>
Xing Wang [Sun, 30 Sep 2018 05:14:42 +0000 (13:14 +0800)]
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>
Jian Hu [Tue, 25 Sep 2018 09:05:07 +0000 (17:05 +0800)]
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>
Bo Yang [Mon, 24 Sep 2018 03:11:39 +0000 (11:11 +0800)]
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>
Jian Hu [Thu, 20 Sep 2018 03:25:26 +0000 (11:25 +0800)]
i2c: meson: add support for tl1
PD#172578: i2c: add support for tl1
Change-Id: I8c761aabfc0c701e2e31eb23e437c9f0e30cf3fd
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
Jian Hu [Tue, 11 Sep 2018 04:22:40 +0000 (12:22 +0800)]
clock: tl1: initial add tl1 clock driver
PD#172587: clock: tl1: initial add tl1 clock driver
Initial add tl1 clock driver refered to txlx clock driver.
Change-Id: I2f25c465ae7f3f4e65e842a9d0c35f0e0e75662f
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
bichao.zheng [Wed, 19 Sep 2018 08:39:47 +0000 (16:39 +0800)]
pwm: meson: add support for tl1
PD#172587: pwm: meson: add support for tl1
Add support for tl1.
Change-Id: I5db1be16765a8e2f2a07815e6d7d139eec4dcf16
Signed-off-by: bichao.zheng <bichao.zheng@amlogic.com>
Xingyu Chen [Sat, 15 Sep 2018 04:22:34 +0000 (12:22 +0800)]
irqchip: meson: add gpio IRQ support for tl1
PD#172587: irqchip: add gpio IRQ support for tl1
Change-Id: I35480088e85c0bb26d04158ced42c3d85153f806
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Xingyu Chen [Mon, 10 Sep 2018 02:08:09 +0000 (10:08 +0800)]
pinctrl: meson: add pinctrl & gpio driver for tl1
PD#172587: pinctrl: add pinctrl & gpio driver for tl1
Change-Id: Ibd04477b8e6d586f4263cda9760b06c3e8e6ac72
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Xingyu Chen [Tue, 25 Sep 2018 09:27:24 +0000 (17:27 +0800)]
chipid: meson: add chip id definition for tl1
PD#172587: chipid: add chip id definition for tl1
Change-Id: Icd45ea3b960de2d9094878f96a6da584cc5c6d55
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Yi Zhou [Fri, 21 Sep 2018 11:40:51 +0000 (19:40 +0800)]
dv: turn off overscan when dv on
PD#173674: dv: turn off overscan when dv on
Change-Id: Ib0b56402038812df1b5e540271608862a59f085e
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
Xing Wang [Tue, 3 Apr 2018 06:03:41 +0000 (14:03 +0800)]
audio: auge: fix spdif in & out work at the same time for ASRC
PD#163795: audio: auge: fix spdif in & out work at the same time for ASRC
1. fix spdifin toddr as right_j for asrc, not support asrc 32bit now
2. fix clk dir for set_sysclk
3. auto enable/disable asrc when switch raw data and pcm data source
4. fix lr channel swap when replug in
5. detect spdifin sample mode by max_width
6. force to clear spdif in sample rate irq bit for axg
7. enable spdif in for s420 boards
Change-Id: I83dc211815068b9d073fb20433c76ce9f129b40e
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
Jiyu Yang [Tue, 18 Sep 2018 11:50:44 +0000 (19:50 +0800)]
arm: dts: tl1: add gpu dtsi for 32bit
PD#172587: arm: dts: tl1: add gpu dtsi for 32bit
Change-Id: I19699e911871b1daf374aa6e949f1b41a255e0f7
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
Bo Yang [Thu, 27 Sep 2018 09:14:42 +0000 (17:14 +0800)]
arm: dts: tl1: add initial device tree for tl1
PD#172587: arm: dts: tl1: add initial device tree for tl1
Change-Id: I17734ee00d88a84ff19bf17f8edf519e3ed2f0e4
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
keke.li [Wed, 26 Sep 2018 05:51:54 +0000 (13:51 +0800)]
gdc: Sync the gdc dma buffer
PD#173042: gdc: Sync the gdc dma buffer
Change-Id: Id4f70c2379ab82519e3b3eeb780f8db17b4deeaf
Signed-off-by: Keke Li <keke.li@amlogic.com>
Bencheng Jing [Fri, 21 Sep 2018 11:19:36 +0000 (19:19 +0800)]
amvecm: change ve hist from limit to full range for tv chips
PD#173611: change ve hist from limit to full range for tv chips.
Change-Id: Ibe7050023a0e4fb740283c7aa2d3b82e37be0ab3
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
pengcheng chen [Tue, 25 Sep 2018 09:40:40 +0000 (17:40 +0800)]
ge2d: fix ge2d coverity error
PD#174270: ge2d: fix ge2d coverity error
Change-Id: I870b17d9665e3af435f36aacd64a3c9ce59d5f1b
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
binqi.zhang [Tue, 25 Sep 2018 09:01:51 +0000 (17:01 +0800)]
ion_dev: fix detects in ion_dev
PD#166793: SWPL-198 Coverity for ion
Change-Id: I0f327888fc3fbb0247e489b8da9d1bc3dce03c23
Signed-off-by: binqi.zhang <binqi.zhang@amlogic.com>
Jianxin Pan [Thu, 27 Sep 2018 14:31:05 +0000 (07:31 -0700)]
Merge "audio: correct the 958 clock setting after dd+ pass through" into amlogic-4.9-dev
Xu Jian [Fri, 14 Sep 2018 06:07:18 +0000 (14:07 +0800)]
audio: correct the 958 clock setting after dd+ pass through
PD#166264: correct the 958 clock
Change-Id: I3961bc21e9d9c13973ecdbc0d944b5411750f377
Signed-off-by: Shen Liu <shen.liu@amlogic.com>
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
Bo Yang [Thu, 13 Sep 2018 11:10:37 +0000 (19:10 +0800)]
script: amlogic: add script to build 32bit image for meson64
PD#172587: script: add script to build 32bit image for meson64
Use the new options:
-c specify defconfig with full name
-f specify rootfs
-b specify prefix or suffix of dts for the board
-p specify prefix of dts for the chip
-d make distclean
-h print help summary and examples
Change-Id: I44effd373f9c2928c7aa2ecb226baa6e4799da7e
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
Dezhi Kong [Thu, 13 Sep 2018 10:58:59 +0000 (18:58 +0800)]
di: fix mc config issue
PD#173918: di: fix mc config issue
Change-Id: Iaa685cb579552fbc94889ca482b2ced72c899210
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
Jiyu Yang [Tue, 18 Sep 2018 11:17:44 +0000 (19:17 +0800)]
dts: limit g12b gpu freq to 800M
PD#173903: dts: limit g12b gpu freq to 800M
Change-Id: I82baa92fb81f14edbccffc6ad14fe0c3df1ab222
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
Shunzhou Jiang [Mon, 10 Sep 2018 09:23:29 +0000 (17:23 +0800)]
g12b: clk: improve pcie high/low vol and high/low temperature effect
PD#173423: improve pcie
Change-Id: Ifb4713c6a49d0dd8ba9ec310a8d95b8e6eec17a8
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
Bencheng Jing [Fri, 21 Sep 2018 04:24:24 +0000 (12:24 +0800)]
amvecm: enable rdma write registers [2/2]
PD#173259: enable rdma write registers
Change-Id: I862bfac20e98e30b1188af5a5f8ad3a1f2662095
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
yuegui.he [Fri, 21 Sep 2018 08:07:06 +0000 (16:07 +0800)]
DTS: axg_s420_128m change secmon reserve method to CMA.
PD#174134: axg s420 128m ddr trunk secmon malloc failure
Change-Id: Ie836d84537056cd28c1d5a4868b3cdc5fd710cac
Signed-off-by: yuegui.he <yuegui.he@amlogic.com>
Bo Yang [Thu, 13 Sep 2018 09:04:05 +0000 (17:04 +0800)]
scripts/amlogic: adjust the name of the options
PD#172587: scripts/amlogic: adjust the name of the options
Use the new options:
-c specify defconfig with full name
-f specify rootfs
-b specify prefix or suffix of dts for the board
-p specify prefix of dts for the chip
-d make distclean
-h print help summary and examples
Change-Id: I709c468fd06a15d3a66cc2c9d316e7898aab4d99
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
Bo Yang [Thu, 13 Sep 2018 07:52:58 +0000 (15:52 +0800)]
scripts/amlogic: fix spelling mistake
PD#172587: scripts/amlogic: fix spelling mistake
Change-Id: I56fd60b2ee32e0b01eef796ae1a91839e8d1453d
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
Bencheng Jing [Wed, 19 Sep 2018 07:07:32 +0000 (15:07 +0800)]
amvecm: Modified hist and pq_load_table struct define [2/2]
PD#173911: to compatible 64 bit with 32 bit
Change-Id: Ie3da5b63a05a306a99a7844eea7c2918cc15d5a9
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
pengcheng chen [Fri, 21 Sep 2018 03:22:31 +0000 (11:22 +0800)]
osd: dts: fix osd cma alloc-ranges caused uboot logo show blurrry
PD#173881: osd: dts: fix osd cma alloc-ranges caused uboot logo
show blurrry
Change-Id: I60503a95f83d66605ecf4c24f882b4606cc37ed3
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
Bencheng Jing [Tue, 18 Sep 2018 08:59:35 +0000 (16:59 +0800)]
amvecm: fix cm2 adj interface error
PD#173878: fix cm2_sat/cm2_luma/cm2_hue_by_hs interface error
Change-Id: Ia2a6bb19396cb1c74094330ba7428a7fc899bd56
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
Bencheng Jing [Wed, 19 Sep 2018 02:34:20 +0000 (10:34 +0800)]
amvecm: optimize amvecm_set_saturation_hue_post
PD#173878: protect array index to avoid overstep the boundary
Change-Id: I86d0f75e35dbdaed45166e6e860bb90ce6bd062b
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
xuhua zhang [Thu, 13 Sep 2018 11:50:00 +0000 (19:50 +0800)]
viuin: do not clear viu sel venc status
PD#171181: viuin: do not clear viu sel venc status
Change-Id: I1476a960a32fa0ba36b2d4d34b5fc6bcaadc7d28
Signed-off-by: xuhua zhang <xuhua.zhang@amlogic.com>
xuhua zhang [Fri, 7 Sep 2018 07:24:32 +0000 (15:24 +0800)]
vdin: fix vdin dobly addr alloc error.
PD#155104: fix vdin dobly addr alloc error.
Change-Id: Iaabf5ed9513f37b438eeb2e00d43d1ecc6b1c5f8
Signed-off-by: xuhua zhang <xuhua.zhang@amlogic.com>
Nan Li [Thu, 30 Aug 2018 11:16:30 +0000 (19:16 +0800)]
emmc: add fix adj calculation.
PD#173425: add emmc fix adj calculation.
Change-Id: Iab512f0971abe0d0452be4d0b58405c6eba103eb
Signed-off-by: Nan Li <nan.li@amlogic.com>
Guosong Zhou [Thu, 13 Sep 2018 10:47:22 +0000 (18:47 +0800)]
amlvideo2: fix screen black when change hdmi resolution
PD#173275: amlvideo2: optimize amlvideo2 notifier callback
Change-Id: I9a961f6091e63fff1dfff318c06e0a068b791bac
Signed-off-by: Guosong Zhou <guosong.zhou@amlogic.com>
libo [Wed, 19 Sep 2018 09:11:58 +0000 (17:11 +0800)]
wifi: update broadcom dhd_static_buf.c
PD#171947: update broadcom dhd_static_buf.c
Change-Id: I8895e097744c375f5eaa3fdaaa6f1b1f2d2d8b73
Signed-off-by: libo <bo.li@amlogic.com>
Brian Zhu [Wed, 19 Sep 2018 13:38:38 +0000 (21:38 +0800)]
osd: disable mali afbc read when osd suspend
PD#171613: osd: disable mali afbc read when osd suspend
Change-Id: I39c900da599b97d7183dfbf9f68261fec997f154
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
Jianxiong Pan [Wed, 19 Sep 2018 10:44:32 +0000 (18:44 +0800)]
defconfig: aarch32: fix defects in aarch32 defconfig
PD#173683: defconfig
Change-Id: I54f9b9fe56e961ed1f4e002514fb821f991aad22
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
Jianxiong Pan [Wed, 19 Sep 2018 02:25:09 +0000 (10:25 +0800)]
defconfig: aarch32: sync defconfig between aarch32 and aarch64
PD#173683: defconfig
Change-Id: I70017bc8af82d52c61d5c872c077b900879e9550
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
Kaifu Hu [Tue, 18 Sep 2018 06:04:41 +0000 (14:04 +0800)]
hdmitx: fix KASAN Bug in hdmitx_edid_parse [1/1]
PD#173547: hdmitx: fix KASAN Bug in hdmitx_edid_parse
BUG: KASAN: stack-out-of-bounds in hdmitx_edid_parse+0x22c/0x2c40
Read of size 1 at addr
ffffffc047927a4f by task power@1.0-servi/2947
Change-Id: Ia1dda5aa80a9fc33a0e81eb9af51ea42a3731c66
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
keke.li [Fri, 14 Sep 2018 08:02:03 +0000 (16:02 +0800)]
gdc: support Y_grey/YUV444p/RGB444P format image
PD#173042: gdc: support Y_grey/YUV444p/RGB444P format image
Change-Id: I5b6928bfb4000d58d2bbd05bf8b1121b83ec2c0a
Signed-off-by: Keke Li <keke.li@amlogic.com>
yicheng shen [Fri, 7 Sep 2018 06:21:32 +0000 (14:21 +0800)]
hdmirx: add hdcp22-not-support handle[2/2]
PD#173334: hdmirx: add hdcp22-not-support handle
if systemcontrol cant access the aic tool,inform driver
that hdcp2.2 is not support via ioctl
Change-Id: I2d9541a497842e027e898f5fa3a23c51583c8181
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>