Commit Graph

643289 Commits

Author SHA1 Message Date
Yalong Liu
af036febfb PD#NONE: test git right
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
2018-02-23 14:12:34 +08:00
Yalong Liu
fa121b2d34 Merge branch 'amlogic-4.9-dev' of git://git.myamlogic.com/kernel/common into amlogic-4.9-dev 2018-02-22 10:15:48 +08:00
Zhi Zhou
cc1dabc182 media: codec_mm: fixed some bugs
PD#154520: media: fixed some bugs
	1. codec_mm: fixed alloc & free statistics error bug
	2. codec_mm: when some buffers have used. a big size alloc failed,
	   because of faragmented.
	   add retry for alloc small size.
	   and del some dump infos
	3. codec_mm: fixed codec_mm fast play bug
	4. don't used system's cma pool

Change-Id: I047f1bed75729cf6fe14040243d82906832c9497
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
2018-02-21 17:30:10 -08:00
Yicheng Shen
5089368f74 hdmirx: fix hdmirx soundless issue
PD#159963 hdmirx: fix hdmirx soundless issue

Change-Id: I60a63af785d3a9c737814ad2d079905e4f0f07a8
Signed-off-by: Yicheng Shen <yicheng.shen@amlogic.com>
2018-02-13 18:53:25 -08:00
kele bai
e318415472 di: decoder buffer mangement changed for multi decode
PD#152765: di: no put decoder buffer after unreg

Change-Id: Ifb68b53ab35ac94905b59b0400213814a5ee6ec9
Signed-off-by: kele bai <kele.bai@amlogic.com>
2018-02-13 15:44:13 +08:00
Lianlian Zhu
f85537a1b7 hdmi_tx: solve audiopolicy update at flash plug issue[1/1]
PD#155057: add a delay of 2000ms for disconect to filt the flash plug

Change-Id: Ic5402ccf9f03293a87ee0321c7f8754b2a1c5310
Signed-off-by: Lianlian Zhu <lianlian.zhu@amlogic.com>
2018-02-12 00:58:45 -08:00
Bencheng Jing
6d796b43ec vdin: fix black screen caused by vdin_check_vs
PD#160716: vdin: fix black screen caused by vdin_check_vs

1.add vdin msrclk in dts
2.remove vdin_check_vf

Change-Id: Ie0a63821f2eea85cf8f67202b067e4f2b491066c
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-02-11 21:50:55 -08:00
Yalong Liu
5d07664407 drm: enable q200 drm dts
PD#158474: enable q200 drm dts

Change-Id: If9f08e4b78c9cd0ba4c3307740ad9b53dc73937a
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
2018-02-11 17:48:38 +08:00
Peipeng Zhao
e4341e80c1 sound: resove external loopback for 2ch pdm + 2ch loopback on axg
PD#160814: sound: resove external loopback for 2ch pdm + 2ch loopback

Change-Id: I7a558dcc3850d4d174faa3c9259394b78bf8f45b
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2018-02-11 15:14:43 +08:00
Bencheng Jing
6d2bf52480 di: fix pulldown crash caused by wrong pointer
PD#160099: di: fix pulldown crash
1) fix pulldown info bit error

Change-Id: I9c111cda6efb7b3161f601d6ffe3c17838108b4a
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-02-08 19:10:31 +08:00
Nian Jing
16f9f71bf3 tvafe: fix palm/n flash on adjust CROSS
PD#160251: fix palm/n flash on adjust CROSS

Change-Id: Ic4a122b45a0bbeba7cbc277d73fc720e8c4d212e
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-02-08 00:22:00 -08:00
Zongdong Jiao
9594c4e4f0 hdmitx: remove unused print message
PD#160315: hdmitx: remove unused print message
1. if current cmd is correct, no need print extra info any more.
2. correct cmd judgement

Change-Id: I088ace66eba224359b57f6cf190eefee3076304b
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2018-02-07 03:46:30 -08:00
Yalong Liu
11d0a4f6ba DRM: fix gem_prime_get_sg_table
PD#158474: fixed gem_prime_get_sg_table

modified gem_prime_get_sg_table by allocating
a sg_table for this GEM object through
sg_alloc_table and sg_set_page APIs

Change-Id: Idb7446e8ffa8700a2b8e2a2b2db1c5c3c4d62eb5
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
2018-02-07 02:11:00 -08:00
tao zeng
c4c0f4ce68 mm: Improve page trace and mm debug function
PD#160479: mm: Improve page trace and mm debug function

1. Use page->flags to store trace value in 64bit Kernel;
   And this feature can be enabled default, without any
   memory usage increase;
2. Sort and optimize common caller find function in pagetrace;
3. Add some debug print for secmon/of-reserved memory.

Change-Id: I70ce1629889934a5bf31b91df570afa537339479
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2018-02-07 10:21:21 +08:00
Nian Jing
8029810ff9 tvafe: modify avdetect config process
PD#154265: modify avdetect config process

Change-Id: I889e4244abf1a8e3ed83e7cb3d1a2d4983dc09ba
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-02-06 00:09:41 -08:00
Jianxin Pan
ba61437e80 Merge "amvecm: fix pq load fail" into amlogic-4.9-dev 2018-02-05 18:29:17 -08:00
MingLiang Dong
12c6a8c12a amvecm: fix pq load fail
PD#158996: amvecm: fix pq load fail

Change-Id: I23d26427ebff2d13c2ea95ffa0b97c9b9a14f865
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-02-05 03:34:45 -08:00
hongmin hua
18e836d11a cec: add unlock for every return
PD#158781: cec: add unlock for every return

Change-Id: If4b0b563040c8c5fa62cd7e2cd3487d3663042dc
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
2018-02-05 17:33:52 +08:00
Luan Yuan
1b596398a8 hdmitx: 2160p50zh contains 2160p50hz420 etc.[1/2]
PD#158454: hdmitx: uniform the sysfs node 'disp_cap'

Previous handling of node 'disp_cap' may contains both '2160p50hz'
and '2160p50hz420', which may confuse the application.
Now start to uniform the 'disp_cap', which will only contains valid
mode, without colorspace information. Not each combination of 'disp_cap'
and 'dc_cap' is valid, please use 'valid_mode' to test combination.

Change-Id: I2d1c97b33272ddd439acf8cadef9e35dfc2dbe82
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2018-02-04 23:04:59 -08:00
kele bai
e1d6405555 di: speed up input mif read efficiency
PD#159864: di: speed up input mif read efficiency

1) change input mif read pass ratio from 50% to 66.6% according
   to vlsi's suggestment
2) pass ratio = (pass_cnt + 1)/(pass_cnt + 1 + hold_cnt + 1)

Change-Id: Ib5bc274f40e3e085c22f807effbac436a02b0d76
Signed-off-by: kele bai <kele.bai@amlogic.com>
2018-02-04 05:48:57 -08:00
Xing Wang
35464c4784 audio: dts: disabled dmic
PD#157997: audio: dts: disabled dmic

Change-Id: Id8a71dbf1c51db46ae2ca678952a8108707dcf03
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2018-02-04 05:48:44 -08:00
Bencheng Jing
884db5dc50 di: fix pq load fail
PD#158740: di: fix pq load fail

1) problem: load reg in thread run into gate turn off
2) solution: load reg in size config after gate on
   add debug information for load reg fail&successful

Change-Id: I46e57f15c9231bcf4f3e889e357009e8c9b0fbaa
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-02-02 04:14:04 -08:00
Dezhi Kong
ecc1113666 di: fix flash black issue
PD#159372: di: fix flash black issue

Change-Id: Ib37b257ba1ce88d6923f68341a4782b1924ac4c6
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
2018-02-02 00:03:56 -08:00
Peipeng Zhao
340bfe757e sound: fixed pdm record data slow error
PD#160225: sound: fixed pdm record data slow error

Change-Id: I8a6a0ae3207c27c6928342057df44b6454de55c2
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2018-02-02 14:30:55 +08:00
Yi Zhou
5ec43f40ae hdmitx: eliminate the unreasonable mutex
PD#157189: hdmitx: eliminate the unreasonable mutex

Change-Id: I0ce4ebb1440c8a346602f892cae7afafa38cbfe7
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2018-02-01 21:28:41 -08:00
Lianlian Zhu
1c617c9407 audio: add axg audio efuse module support
PD#160113: audio:add axg audio efuse module support

Change-Id: I3b18ea4c7b8eb5069a1038a5c5c6b11b46d198c7
Signed-off-by: Lianlian Zhu <lianlian.zhu@amlogic.com>
2018-02-01 15:02:39 +08:00
Peipeng Zhao
f5febfdaf8 sound: changed endian mode of pcm
and fixed pdm in i2s code clk error for gxl chip

PD#160061: sound: changed endian mode of pcm

and fixed pdm in i2s code clk error for gxl chip

Change-Id: Idb0f8bc32dbe49dafbab73c30ca20491a7e6891a
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2018-01-31 00:01:37 -08:00
hongmin hua
c592259836 cec: modify dts pintrl selection to default
PD#158936: cec: modify dts pintrl selection to default

Change-Id: Id6718d7920b08d856081e39806458f3baf998b4e
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
2018-01-31 11:03:47 +08:00
Yvonne Chen
a1e4958ced tee: add tee load dynamic control
PD#159071:  tee load dynamic control using disable_flag

using disable flag to disable tee load 

Change-Id: I9c138e3830412ee04dcd82812b1a00cbed1ab940
Signed-off-by: Yvonne Chen <yvonne.chen@amlogic.com>
2018-01-30 03:46:54 -08:00
Pengguang Zhu
6678c94da3 tee: firmware: add new parameter vdec type
PD#159071: add new parameter vdec type

Change-Id: Ib3d49d2bbc56a36844d0c53a7c8a46d30543ebdc
Signed-off-by: Pengguang Zhu <pengguang.zhu@amlogic.com>
2018-01-30 03:33:23 -08:00
Evoke Zhang
4b74c61a7e lcd: optimize lcd notifier event for power sequence
PD#158197: lcd: optimize lcd notifier event for power sequence

Change-Id: I6b91bf1c2c6e31dfa3133f078d37d32fdce2a5bd
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-01-29 22:28:30 -08:00
wenfeng.guo
d636f6ddb9 di: optimize wire drawing in pulldown22 video appears on gxlx
PD#157033: di: optimize wire drawing in pulldown22 video appears on gxlx

Change-Id: I4c56cee942059794aac4969febbf35c0ef565fd3
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
2018-01-29 22:10:09 -08:00
Kaifu Hu
f8043428e5 hdmitx: add delay for plugout
PD#157869: hdmitx: add delay for plugout

1. add delay for plugout and ignore plugout work when boot.
2. delete set display when plugin.

Change-Id: I21fee9d3f68dc5fe84bcd76efc0a8572e3976ef6
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
2018-01-29 21:16:22 -08:00
Bencheng Jing
827be37207 di: fix pulldown crash for 1080i&1088i timing
PD#159599: di: fix pulldown crash for 1080i&1088i timing

Change-Id: I1f89920e195feaaa643f94d9227bf2e1a0268b15
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-01-29 20:13:31 -08:00
Nian Jing
962ff2bb1d cvbs: fix display set mode block
PD#157658: add delaywork enable dac

Change-Id: I2682c80c7a28d8bfdb88e038141c3e83aea33c46
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-01-29 20:01:21 -08:00
hongmin hua
f869a01da6 cec: set reg map before irq enable
PD#158921: cec: change the order of irq in probe

Change-Id: I8099e918a06c9d741de890b773ec6ca47ab44aba
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
2018-01-29 19:11:45 -08:00
Matthew Shyu
f9fc29dfa1 crypto: Enable EXT4_ENCRYPTION for file based encryption [2/4]
PD#158397: crypto: enable FBE

Encrypto CONFIG_EXT4_ENCRYPTION for file based encryption

Change-Id: Iaad3679bc9ac05eea1d44ad7c6d30a0324e82e89
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
2018-01-29 01:28:31 -08:00
Tellen Yu
2f910981f0 ppmgr:enable ppmgr module [1/1]
PD#157786: enable ppmgr

enable txlx ppmgr feature

Change-Id: I3939724e5a9c51349875bc340e5fcd47c2774e12
Signed-off-by: Tellen Yu <tellen.yu@amlogic.com>
2018-01-28 23:37:37 -08:00
Peipeng Zhao
5a2011bc59 audio: add audio external loopback feature for axg chip
PD#159617: audio: add audio external loopback feature for axg chip

For S400 & S420 board, please modify dts to enable external loopback
please read following file:
Documentation/devicetree/bindings/amlogic/axg-sound-loopback.txt

Change-Id: Ie96d10eb8e6ae81aaff0b3e6965aa4e22f07f0b8
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2018-01-26 13:45:47 +08:00
Sunny Luo
d86163bbff touchscreen: goodix gt9xx driver support
PD#158973: goodix gt9xx driver support

Change-Id: Iffac9172ab1869521ecff731f7d50ddf7ea01b14
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
2018-01-24 01:33:08 -07:00
Yi Zhou
27f6767cb7 hdmitx: update gxm dts
PD#154260: hdmitx: update gxm dts

Change-Id: Iddf3aa4512e5073f7e7dd1ba4558f38eb7998d58
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2018-01-23 22:48:16 -07:00
Kuibao Zhang
0f31ad4a47 dts: fix 8.1 r311 bt open fail
PD#159307: BT fix 8.1 r311 bt open fail
1.DTS,change bt en pin
2.FIX bt en pinmux

Change-Id: I59c5978a5b52b49f9aa1aeede93d2761bca62959
Signed-off-by: Kuibao Zhang <kuibao.zhang@amlogic.com>
2018-01-23 18:59:06 -07:00
Kaifu Hu
76d55ee5ec hdmitx: update txlx dts
PD#159209: hdmitx: update txlx dts

add hdcp22_skpclk and hdcp22_esmclk.

Change-Id: I2a1cc3fd31cf3bb5002cdc1673573f18349f612d
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
2018-01-23 18:56:34 -07:00
Nian Jing
aa90ad1e9d vbi: fix vbi crash on switch channel
PD#158142: fix vbi crash on switch channel

Change-Id: I0d4a585479b142cc585db0b00efb9d8772cc61ee
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-01-23 17:27:58 +08:00
Weiming Liu
9fee745b2a lcd: add lcd_extern p070acb driver
PD#159016: lcd_extern: add p070acb driver

Change-Id: Id2fd949f37815de1ec9bbd90170dce459b661256
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
2018-01-22 21:24:54 -07:00
Victor Wan
20946741c8 Merge branch 'android-4.9' into amlogic-4.9-dev
Conflicts:
	Makefile
	init/main.c
2018-01-22 20:17:25 +08:00
Liang Yang
6794963993 nand: Rsv zone bug fix
PD#156785: enhance rsv ecc&incomplete abnormal handler

NOTE: Relative commit(bug156785), patch together.

Change-Id: I05f9a4c521b75f5fcd071fdf09ca76a3f0aae033
Signed-off-by: Liang Yang <liang.yang@amlogic.com>
2018-01-21 21:19:24 -07:00
Xing Wang
105c91184a audio: dts: fix i2c for tas5707 and i2s pinmux
PD#159131: audio: dts : fix i2c for tas5707 and i2s pinmux

Change-Id: Ic4a2de8b5dcba668a793bf0c0c17d660418933b2
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2018-01-20 18:09:27 -07:00
Evoke Zhang
cfc68c2718 lcd: optimize gpio register function for init value
PD#158752: lcd: optimize gpio register function for init value

For gpio register required init value, we can't register gpio when
lcd probe, otherwise it maybe change the gpio value which is working
by bootloader init.
So we register gpio when first calling by lcd power step controlling.

Change-Id: I629143f50924aac7e3ea27aa1a2c4b12a1992b71
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-01-20 18:04:59 -07:00
Jian Wang
5e67a17e72 ionvideo: update ionvideo dts for tv
PD#158997: update ionvideo dts for tv

Change-Id: Iefa4ed1b93dc244d23aa0892e04722aed2836eb7
Signed-off-by: Jian Wang <jian.wang@amlogic.com>
2018-01-20 18:02:09 -07:00