Commit Graph

641391 Commits

Author SHA1 Message Date
Peipeng Zhao
f6a3271ab8 audio: add audio codec es7243 driver
PD#153483: codec: add sound codec es7243 driver

Change-Id: I3e4e76026bca7ea75df2ad8b0c5e6a730826c4bc
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2017-11-09 12:22:07 +08:00
Jiamin Ma
8e96d0d385 printk: a fix for log output disordering
PD#154008: the log output is in disorder

The defination for a continues line in printk is much more strict
from 3.14 to 4.9:

in kernel 3.14, if the first fragment does not end with CR, and the
next fragment does not start with LOG_PREFIX(KERN_ALERT, KERN_ERR and
so on), then they are in a continues line

eg. pr_err("foo "); printk("bar\n")
    or pr_err("foo "); pr_cont("bar\n"); both are printing a continues
    line

in kernel 4.9, if only the first fragment does not end with CR, and the
next fragment start with LOG_CONT, then they are in a continues line

eg. pr_err("foo "); printk("bar\n"); are not printing a continues line
    and pr_err("foo "); pr_cont("bar\n"); are printing a continues line

but in the code path of crash info dumping in kernel 4.9.y, not all of
the continues line printing has been switched to the 4.9 way(aka.
calling pr_cont). Only in kernel 4.13.y all of that has been updated.

so in this commit, we lose the definition of continues line back to
3.14 way to sovle current issue, and need to revert it when we sync
with upstream kernel 4.13.y

Change-Id: I64403d3a18531ceb832b41d96dff4b79a6d7fb5a
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-11-07 22:43:05 -07:00
Yalong Liu
63a6fdd4fa drm: force ARGB8888 format to osd display
PD#152825: convert XRGB8888 to ARGB8888 fomat to osd display

Change-Id: Ia7c7362510d14ecbff5273e1df95f8c5441e0398
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
2017-11-07 18:38:04 -07:00
liangzhuo.xie
bcc77e8542 dts: create p230 buildroot dts
PD#146897: create p230 buildroot dts.[2/2]

Change-Id: If1ad7718cad1c52ece538dd06288ab7d3905e1c5
Signed-off-by: liangzhuo.xie <liangzhuo.xie@amlogic.com>
2017-11-07 05:20:49 -07:00
tao zeng
42ef1cc737 mm: change memory pre-alloc of page trace
PD#153090: mm: change memory pre-alloc of page trace

Use standard API of alloc_page* instead of directly delete page
lru from buddy.

Change-Id: Ia537d39f5d4e7e66c2c36eeeaf837b09bbccebff
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2017-11-07 03:46:52 -07:00
Xindong Xu
5281102bdc PD#153899: p241: add arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts [2/2]
1. init gxl_p241_1g.dts from gxl_p241_1g_buildroot.dts
2. change gxl_p241_1g.dts accord to gxl_p212_1g.dts in
   4.9 & gxl_p241_1g.dts in 3.14

Change-Id: I73ab298776ca257f79f4f54b5a4e619dd8af1a15
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2017-11-07 00:50:13 -07:00
liangzhuo.xie
35ca293b34 dts: fix the boot-strap crash
PD#152825: fix the boot-strap crash

Change-Id: I427e09237b8fef508f129b509d5045eae7bd2149
Signed-off-by: liangzhuo.xie <liangzhuo.xie@amlogic.com>
2017-11-07 11:11:00 +08:00
Kuibao Zhang
6e9a95794a defconfig: meson64: add CONFIG_HIDRAW
PD#150889: Support Android O BT remote audio

1.CONFIG_HIDRAW=y

Change-Id: I21cf8d6f33c11477f8d54295c48dc9fdb752ec37
Signed-off-by: Kuibao Zhang <kuibao.zhang@amlogic.com>
2017-11-06 05:10:12 -07:00
Hui Zhang
4425d2ecd9 PD#153316: media: sync decoder code with 3.14 trunk
add two ioctl defines which used in media module

Change-Id: Ie4bde7b9c3803b767bef66e1edf3078b771870d8
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2017-11-02 20:19:25 -07:00
Pengcheng Chen
f109793251 osd: replace the timeout number with msecs_to_jiffies
PD#150542: replace the timeout number with msecs_to_jiffies
1. osd: replace the timeout number with msecs_to_jiffies
2. ge2d: replace the timeout number with msecs_to_jiffies

Change-Id: I5f0032076f305932b0636742db37f537e34b4962
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-11-02 10:36:34 +08:00
Yi Zhou
b9f554f6e6 hdmitx: add pwr note function
PD#152848: add pwr note function

Change-Id: Ibcde5410eca1f254dc9ffdb8e97feb67f36758d7
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2017-11-01 00:00:23 -07:00
Yi Zhou
23770ea332 hdmitx: fix reading error EDID
PD#153236: hdmitx: fix reading error EDID

When reading EDID by using HW way, there is a logic error in it.
We forget to write 1 to 0x60 address when reading EDID every time.

Change-Id: Iee3148b16ee18df5549754cab63cd2ace80f348c
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2017-10-31 23:59:04 -07:00
Xindong Xu
9e3e45d529 dts: add partition dtsi for old partition table [2/2]
PD#152829: add partition dtsi for old partition table

Change-Id: I78a84c19fda1f3c1f5aa074dc8606a08ea579f8c
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2017-10-31 23:00:17 -07:00
Yalong Liu
5fa3bbc4d1 drm: prune drm implement if using osd
PD#152825: prune drm to only gem when using fbdev
if using drm, drm must be complete

Change-Id: I17beff6232ca4b5dbf7ce24798f6a638eab42ea7
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
2017-10-31 20:16:03 -07:00
Yonghui Yu
ac4b135e38 emmc: add volume name in partinfo
PD#151127: emmc: add volume name in partinfo

this commit try to add partion information into uevent message
in order to support android8.0 early mount

Change-Id: I604c5dfdfbe8c7eb1e46bfa4af3ab1e406278c61
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
2017-10-31 20:15:24 -07:00
Yixun Lan
2a9b274e50 treble: enable full treble mode [9/9]
PD#151674: treble: enable full treble mode [9/9]

dts: add android fstab info to support early mount

the android init(system/core/init) will try to parse dts to
find fstab information in order to support early mount

Change-Id: I6ddd463a8da4e05cef43ec334a6da8bf2094aff2
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2017-10-31 20:15:03 -07:00
Pengcheng Chen
9f334326fb osd: add mem_alloc property in meson-fb dts
PD#152220: osd: add mem_alloc property in meson-fb dts
           set mem_alloc will alloc fb in fb_open,
           otherwise alloc in fb_mmap

Change-Id: I4eb2abb76b17905c146b09eb1a8f2a4f2fdac5b5
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-10-31 19:59:15 -07:00
Pengfei He
26c5e5707b Revert "tee: open tee loading under optee"
This reverts commit 190a64cb3a.

Change-Id: I712f5a1abf4e63197bc5c7ed320c888901dca7c8
Signed-off-by: Pengfei He <pengfei.he@amlogic.com>
2017-10-31 07:03:47 -07:00
Renjiang Han
9b26ee0dc9 ionvideo: Fixed fillbuffer failure causes throwing buffer
PD#152274: Fixed fillbuffer failure causes throwing buffer

Change-Id: Icafef860f57073ba2fc8417e2287f46c9acf9f72
Signed-off-by: Renjiang Han <renjiang.han@amlogic.com>
2017-10-31 06:39:16 -07:00
Jiyu Yang
5e1410d56b clk: fixed gp0_pll spell error
PD#151164: fixed gp0_pll spell error

Change-Id: I06b0c03492ad97260a1a12ca9f3882a8ec579388
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
2017-10-31 02:23:57 -07:00
Eric Dumazet
3347f3d676 tcp/dccp: drop SYN packets if accept queue is full
PD#152538: tcp/dccp: drop SYN packets if accept queue is full

tcp/dccp: drop SYN packets if accept queue is full

Per listen(fd, backlog) rules, there is really no point accepting a SYN,
sending a SYNACK, and dropping the following ACK packet if accept queue
is full, because application is not draining accept queue fast enough.

This behavior is fooling TCP clients that believe they established a
flow, while there is nothing at server side. They might then send about
10 MSS (if using IW10) that will be dropped anyway while server is under
stress.

Change-Id: I674728eac69b418255522afc8d345995b8891a7e
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Acked-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2017-10-31 01:04:32 -07:00
kele bai
d76db689ad di: modify for true bypass case
PD#152280: di: fix 4k clip crash

1) merge true bypass logic from 143783
2) replace bypass direct with di_debug_flag

Change-Id: I3ba7c1a6281d381028904409b101b414b044be90
Signed-off-by: kele bai <kele.bai@amlogic.com>
2017-10-30 23:01:25 -07:00
Pengcheng Chen
7206d62f62 osd_drm: fix osd drm blank function not work
PD#152825: fix osd drm blank function not work

Change-Id: I3a0b337a79f7530ccecd3d762a5441b8e27b6759
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-10-31 10:26:10 +08:00
Yueguie He
c38178c6bb dts: add s400emmc dts
PD#151896: dts: add s400emmc dts

    1. axg_s400emmc.dts
    2. axg_s400emmc_v03.dts

Change-Id: I33231482d7cb1e588f694087d53a1956359ff637
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-10-30 05:52:58 -07:00
Yao.Liu
d0075941ca ionvideo: init input_queue and output_queue in vidioc_open
PD#152800: dont cleaning buffer queue when codec_reset, omx handle it

Change-Id: I0c6ff9ccc729d55da8c601c4fef8210c6fbe0b42
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
2017-10-30 04:44:11 -07:00
Yalong Liu
5ab46dc70c drm: add fbdev emulate implement
PD#152825: add amlogic emulate fbdev implement
it just support software renderring mode

Change-Id: Iffb3b83bbfcc831608e46d9c176fc6c8da8e3ff4
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
2017-10-30 02:06:26 -07:00
Zhi Zhou
72b7250455 ion: enarge ion buffer for some apk.
PD#153238:
	for youtube cast&vr/playmovies

Change-Id: I3857d732056ccf5a9f10cfeefbd7a467631ed08f
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
2017-10-29 19:17:13 -07:00
tao zeng
635d6a79b2 mm: disable page trace by default
PD#153090: mm: disable page trace by default

Change-Id: I25cd5b1e8e475993f25e5455a411f0c9cc079493
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2017-10-28 19:48:15 +08:00
Xing Wang
1495dd0efa audio: fix loopback channel swap, adjust channel map to pdm Dmic array
PD#150757: audio: loopback: fix loopback channel swap and map issue
1) fix loopback audio in disorder
2) adjust channel map to pdm Dmic array

Change-Id: Ia3a4e94687815496ca8fcc57bb97797b2bf37adb
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2017-10-27 07:51:55 -07:00
sky zhou
93c8398efc drm: add amlogic KMS implement
PD#152825: add bypass implement based on amlogic internal driver.

We need reuse the existing driver to implement drm, but not
fully re-write all the drm driver.

Change-Id: Ie6492d8eb978059b9822b98cb7e34a643bdd2c6e
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
2017-10-27 14:20:48 +08:00
tao zeng
df67f6cb1a mm: fix pages delete bug by pagetrace
PD#153090: mm: fix page delete bug by pagetrace

This change fix another bug when page del many times.

Change-Id: I5fe2cc9d688c2e19e2a7d6c6960229e23f8b133c
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2017-10-26 19:17:03 -07:00
Renjun Xu
14fb1b4ec1 aloop: open sound card aloop driver
PD#153105: open sound card aloop driver

Change-Id: I2ddc97f48a229b1e2b4415210d9fa23d7c6dbac4
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
2017-10-26 17:26:56 +08:00
tao zeng
241dcdb6d5 mm: fix vmemmap pages free bug by pagetrace
PD#153090: mm: fix vmemmap pages free bug by pagetrace

A page in vmemap will be freed when pagetrace is enabled.
This caused page information wrong and may cause unexpected
panic issue.

Change-Id: I486c62af592a98c22bd1ab071b3a224c3298986d
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2017-10-25 21:05:30 -07:00
Rongjun Chen
2010889cdf wifi: delete the dhd_static_buf print
PD#146292: delete the dhd_static_buf print

Change-Id: I01daa03d8e38c1738d74f51d1db33c1ed9b61d1e
Signed-off-by: Rongjun Chen <rongjun.chen@amlogic.com>
2017-10-25 20:01:43 -07:00
Yueguie He
f9a914edb0 dts: change system size to 280M
PD#153008: dts: change system size to 280M

Change-Id: Ic1102bae634be539e9825f48eaac3d46c7aa40dd
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-10-24 18:56:25 -07:00
Guosong Zhou
220ba55b24 picdec: initial add the driver
PD#149244: initial add the driver

1.Add amlogic picture decoder driver;
2.device tree of picdec for p212/p230/p231/q200/skt;
3.related Makefiles/Kconfig/Headfiles update;

Change-Id: Ida1d223ac0f976d601d912bc3dce6473d9d3bf86
Signed-off-by: Guosong Zhou <guosong.zhou@amlogic.com>
2017-10-24 18:11:19 +08:00
Jiyu Yang
0e98ac3ae9 Revert "osd: fixed smem_start error [3/3]"
This cause Android can't work, revert it firstly
This reverts commit 474cffeae2.

Change-Id: I6b3b86a6a88fe734900bd9e688bd0683a3008a43
Signed-off-by: Jiyu Yang <jiyu.yang@amlogic.com>
2017-10-23 21:01:51 -07:00
Xing Wang
87b2ed649b audio: fix pdm Asynchronous FIFO for channel shift issue
PD#152798: audio: fix pdm channel shift issue

Change-Id: I1ed76602041625eba2bd6f9691b3d0b8138eac31
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2017-10-23 20:29:13 -07:00
Pengcheng Chen
474cffeae2 osd: fixed smem_start error [3/3]
PD#152220: fixed smem_start error

Change-Id: I8beac687d912d8ffd642d05a9e4c2bee7df02649
Signed-off-by: Jiyu Yang <jiyu.yang@amlogic.com>
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-10-23 03:53:12 -07:00
Jiyu Yang
86aa35db2e dts: update gpu freq tbl for buildroot[2/3]
PD#152220: update gpu freq tbl for buildroot

Change-Id: I5f0409285aa350cd2f87e15b25497229245d28f4
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
2017-10-23 03:21:52 -07:00
Jiyu Yang
fcbaeafc5e clk: update gpu clk node [1/3]
PD#152220: update gpu clk node

Change-Id: I77796b9db66a24466211380432700bbaf50ac1d7
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
2017-10-23 03:19:13 -07:00
tao zeng
a998ca2c01 mm: add pagetrace function
PD#151104: mm: add pagetrace function

1. implement pagetrace as a driver; you can get information
  of how many pages allocated by each function by read:

  cat /proc/pagetrace

2. fix wrong statistics of free memory of each migrate type.

Change-Id: Ib2dff4bb5b3dd288ee188007352fc7b353eda100
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2017-10-23 00:11:33 -07:00
Jianxin Pan
8c990449e2 Merge "mtd: report all bad block as 1" into amlogic-4.9-dev 2017-10-23 00:11:17 -07:00
Yonghui Yu
3f92c04ffe mtd: report all bad block as 1
PD#145359: mtd: report factory bad block as used bad one to mtd.

nandwrite in mtd utilies identify bad blocks by checking whether
return value of mtd_block_isbad is 1;
Our host driver need to distinguish used(1)/factory(FACTORY_BAD_BLOCK_ERROR)
bad block because partition table caculation cares factory bad ones only.

As mtd->_block_isbad is called by inside usage, so we normalize all the bad
block return value in mtd_block_isbad.

Change-Id: I19b0f25ce93ce527b6e02d59330b2edaf61020d4
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
2017-10-22 23:49:48 -07:00
tao zeng
ee76ce9ce0 mm: fix cma allocate fail problem
PD#152454: mm: fix cma allocate fail problem

boost work shoud return right value of __alloc_contig_migrate_range

Change-Id: I8275a8541cd263f5ea5574fba1c053a30e3cbc80
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2017-10-22 23:32:31 -07:00
jintao xu
deca8a9c70 ion_dev: add codec_mm heap for omx. [3/3]
PD#152137: add codec_mm heap for omx
           codec_mm_cma 308M;
           ion_dev_dma 92M;

Change-Id: I804d16c19e6133ec41bd51a7b2c328339a8d0fd7
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
2017-10-22 21:09:46 -07:00
Jiamin Ma
79bb659f90 unifykey: fix arbitrary memory access in unifykeys ioctl
PD#152036: arbitrary memory access in unifykeys ioctl

Change-Id: Ic7aa0fce291af7bd5810b4815137ca26b37110f8
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-10-20 03:01:46 -07:00
Rongrong Zhou
28f7e2859d media: add ioctl video layer1 on/off state in amvideo.[2/1]
PD#152453: add ioctl for OMX to get current video layer1 on/off state
for DRM TVP resource release.

Change-Id: I8a45869f63259500cbe8be7bc146793e6d7eb266
Signed-off-by: Rongrong Zhou <rongrong.zhou@amlogic.com>
2017-10-20 02:37:30 -07:00
Jiamin Ma
a3d748ca70 Revert "unifykey: fix arbitrary memory access in unifykeys ioctl"
This reverts commit 54f617de7f.

Change-Id: Ibdd0cb5c073513bb529e5c39f6f963906391a870
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-10-20 02:29:48 -07:00
Jiamin Ma
54f617de7f unifykey: fix arbitrary memory access in unifykeys ioctl
PD#152036: arbitrary  memory access in unifykeys ioctl

Change-Id: I2e76906bef8f417909d97c8a04289ce38baa6087
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-10-20 16:25:15 +08:00