Commit Graph

647804 Commits

Author SHA1 Message Date
Jihong Sui
bdaa4db03a dtv_demod: txl: fix dvbc can't lock
PD#169985: txl: fix dvbc can't lock

Change-Id: I6094cfb546832cc4c54dae4a065147a05d20c251
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
2018-08-13 23:44:13 -07:00
Hang Cheng
923bf48f16 hdmirx: set rxsense sync with hpd for every port
PD#159499: hdmirx: set rxsense sync with hpd for every port

Change-Id: Ief053dc7772b12516153ef733d057a6b9a02aca2
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
2018-08-13 04:04:10 -07:00
Yi Zhou
2a2a5305a7 hdmitx: add dynamic hdr info to vpp
PD#171350: hdmitx: add dynamic hdr info to vpp

cat /sys/class/amhdmitx/amhdmitx/hdr_cap
cat /sys/class/display/vinfo

Change-Id: I0d42c33e33ccc1f8d56545df25efc2cc60e08f58
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2018-08-13 04:03:48 -07:00
Evoke Zhang
3367113918 lcd: mipi-dsi: optimize mipi read function for video mode
PD#171352: lcd: mipi-dsi: optimize mipi read function for video mode

Change-Id: I7fec036ad568c00ca3573feb3eb5d0544050bfb2
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-08-13 04:00:47 -07:00
Jianxin
ce824cd479 defconfig: remove WQ_WATCHDOG amd DETECT_HUNG_TASK
PD#171500
WQ_WATCHDOG amd DETECT_HUNG_TASK are debug options to detect task/workqueue are
blocked for a long time. Sometimes, error messages are misreported.

Change-Id: Ia898429359b2ff4c656b8b9b009c4a7fa1888931
Signed-off-by: Jianxin <jianxin.pan@amlogic.com>
2018-08-13 03:55:34 -07:00
Jianxin
49d2203703 scritp: update merge check pl
PD#146811
':' and extral message folling PD#xxxx is not a must in line three

Change-Id: Ibe115f6a64bc267730020aaa52f8b21adb2f66a5
Signed-off-by: Jianxin <jianxin.pan@amlogic.com>
2018-08-13 03:53:12 -07:00
Ao Xu
2d5f3dc464 board: add CONFIG_ARM64_A32 and CONFIG_COMPAT
PD#169652: add CONFIG_ARM64_A32 and CONFIG_COMPAT

add CONFIG_ARM64_A32 support and add missing
CONFIG_COMPAT

Change-Id: Id041292cccd39618ba9932d123a219f0583fd4c5
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2018-08-13 03:51:48 -07:00
Tong Li
dc01b66891 dts: Rename the dts name for u220.[2/2]
PD#171618: update dts name g12a_s905d2_u220 to g12a_s905y2_u220

Rename the dts name for u220.[2/2]

Change-Id: I3a9dde9210772bb50f26b68a884d7bdc6346752c
Signed-off-by: Tong Li <tong.li@amlogic.com>
2018-08-13 10:38:44 +08:00
live.li
eca781b7b6 audio:fix dtv no sound output issue[3/3]
PD#170315: audio:fix dtv no sound output issue

add dtv patch in tsync

Change-Id: Idad75b7b3563a251e6bf96141b4d9b2314c2983b
Signed-off-by: live.li <live.li@amlogic.com>
2018-08-10 02:58:33 -07:00
shuze.ma
a0e9a60459 osd: wait for vsync no need lock [1/1]
PD#170791

wait for vsync no need lock

Change-Id: I61f9090b03c3b1d6971265bd1aacf9740a6ce168
Signed-off-by: shuze.ma <shuze.ma@amlogic.com>
2018-08-10 02:13:23 -07:00
Jiyu Yang
e4e2185bd7 osd: fixed compile error on buildroot
PD#170791: osd: fixed compile error on buildroot
Change-Id: Ic2e9d2898b3e5596d18590c4323ac7a1c5599037
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
2018-08-10 02:13:04 -07:00
Chuanzhi Wang
37434e0be6 dvb: add configuration items to control dvb module compilation. [1\2]
PD#169652: Kconfig: Add configuration items.

Change-Id: If5d0a987bda435975fb3a6fa7be26ff8f7099e6f
Signed-off-by: Chuanzhi Wang <chuanzhi.wang@amlogic.com>
2018-08-10 01:47:44 -07:00
Yong Qin
c84c9569e8 cec: otp: support one touch play and enter source
PD#170723: cec: support otp and enter source

	1.get wakeup reason from stick register
	2.add get wakeup reason from wakeup

Change-Id: Idb0e56980569d3092fde971c0dcb73a4684bff0b
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2018-08-10 01:36:28 -07:00
Yong Qin
198a001492 cec: cec: auto power down function fail
PD#171408: cec: auto power down function fail

	1.reason: set auto pw down, disabled cec function

Change-Id: I554b085345bc144e6ff4166aae8c2d9d6620c524
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2018-08-10 00:50:18 -07:00
Ruixuan Li
8842daf8de emmc: upgrade gpt or ept based on priority
PD#168362: P211: emmc: upgrade gpt or ept based on priority

Change-Id: I0e7ea483ac5fc0a59ee24ae21d2e40e1c5d32465
Signed-off-by: Ruixuan Li <ruixuan.li@amlogic.com>
2018-08-10 00:25:06 -07:00
frank zhao
5be8b6507f di: add mif enable after reset for g12
PD#171440: di: add mif enable after reset for g12

Change-Id: I61e3b7e96b88b8875d7de4948fa627c4882ab810
Signed-off-by: frank zhao <frank.zhao@amlogic.com>
2018-08-10 00:01:36 -07:00
Jiyu Yang
76382d549b osd: adjust render kthreads priority [1/1]
PD#170791: by default, it is SCHED_NORMAL.

1a7a93bd33%5E!/
AOSP suggested to use SCHED_FIFO , 2, in Qcom platform.
there are another 2 sleeping point for osd_toggle_buffer.
need to adjust it still.

Change-Id: Ic94a4e1cfee218fc95b53358d2c2e72bbde7bfdd
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
2018-08-09 04:53:19 -07:00
Ao Xu
825c065741 board: use do_div for divid operation
PD#169652: board: use do_div for divid operation

when dividend is 64bit number, divid operation should
use do_div, otherwise link stage will fail for 32bit
system.

Change-Id: Iff2fdc328e364cec6486ab64e2e0f630ccb8534d
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2018-08-09 03:45:48 -07:00
Evoke Zhang
7f5e2a4bd4 backlight: add step power on support
PD#171081: backlight: add step power on support
default disable with bl_step_on_flag = 0.
change bl_step_on_flag to 1 to enable step_on function:
echo 1 >/sys/class/aml_bl/step_on
the brightness will be level_default first,
then come to the system brightness value.

Change-Id: I47ae56c0f814b2e0e5989b71f151ed84ffee795b
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-08-09 01:16:26 -07:00
nengwen.chen
cf0cf49f16 atv_demod: add xtal config for tuner [1/3]
PD#171245: add xtal config for tuner

Change-Id: Id682294ea1e0de265df56509fa5fc4480212f7a7
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2018-08-09 00:26:57 -07:00
Theodore Ts'o
a8b6fdf0f3 ext4: fix check to prevent initializing reserved inodes
Commit 8844618d8a: "ext4: only look at the bg_flags field if it is
valid" will complain if block group zero does not have the
EXT4_BG_INODE_ZEROED flag set.  Unfortunately, this is not correct,
since a freshly created file system has this flag cleared.  It gets
almost immediately after the file system is mounted read-write --- but
the following somewhat unlikely sequence will end up triggering a
false positive report of a corrupted file system:

   mkfs.ext4 /dev/vdc
   mount -o ro /dev/vdc /vdc
   mount -o remount,rw /dev/vdc

Instead, when initializing the inode table for block group zero, test
to make sure that itable_unused count is not too large, since that is
the case that will result in some or all of the reserved inodes
getting cleared.

This fixes the failures reported by Eric Whiteney when running
generic/230 and generic/231 in the the nojournal test case.

Change-Id: I3967036c1d84cc69798b7c948420735c623c9ae8
Fixes: 8844618d8a ("ext4: only look at the bg_flags field if it is valid")
Reported-by: Eric Whitney <enwlinux@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2018-08-08 23:10:57 -07:00
Ao Xu
73cde5ceaf board: fix ioremap call fail issue
PD#169652: board: fix ioremap call fail issue

for arm 32, ioremap will check if page is mapped

Change-Id: Icb5dda1b9de06d32e47c82a6bc45b62873332487
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2018-08-08 03:36:28 -07:00
Ao Xu
c2c2825f0b board: fix stack overflow issue
PD#169652: board: fix stack overflow issue

it is better to use kmalloc to alloc buffer
instead of in stack buffer.

Change-Id: I6825d8acff19248f2f6c789ed2218af42ca4ffd3
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2018-08-08 02:55:03 -07:00
libo
679da508da wifi: fix broadcom pcie wifi driver use static buf failed
PD#171351: fix broadcom pcie wifi driver use static buf failed

Change-Id: I1ce8f0d96b1e2ecd5bbd5b3f9ac805c433d548a2
Signed-off-by: libo <bo.li@amlogic.com>
2018-08-08 00:55:39 -07:00
nengwen.chen
d439434ddc dvb-core: recover dvb-core support dtmb in dvb v3 [1/1]
PD#170409: dvb-core: recover dvb-core support dtmb in dvb v3

Change-Id: I31c1ed779a92f3b7c19a1053eaf739d531a3b31e
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2018-08-08 00:54:14 -07:00
Yong Qin
7e49230669 cec: add port info for mix mode
PD#170794: cec: add port info for mix mode

	1.add port info for output and input mix mode
	2.port number= input number + output number
	3.r321 dts add 1 output number for mix mode

Change-Id: I17692f5fb4526b4f95474f5ea36c11213034724f
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2018-08-07 19:42:46 -07:00
Kaifu Hu
4a69c7795c hdmitx: hdmitx: add debug info
PD#170492: hdmitx: add debug info

1. add avi package info.
   ->echo avi_info > /sys/class/amhdmitx/amhdmitx0/debug
2. add vsif package info.
   ->echo dv_info > /sys/class/amhdmitx/amhdmitx0/debug
3. add drm package info.
   ->echo hdr_info > /sys/class/amhdmitx/amhdmitx0/debug
4. add audio info frame info.
   ->echo aud_info > /sys/class/amhdmitx/amhdmitx0/debug
5. add audio acr info.
   ->echo acr_info > /sys/class/amhdmitx/amhdmitx0/debug
6. add audio sample.
   ->echo aud_sample > /sys/class/amhdmitx/amhdmitx0/debug
7. add audio channel status.
   ->echo aud_chls > /sys/class/amhdmitx/amhdmitx0/debug
8. add audio info in sysfs config.
   ->cat /sys/class/amhdmitx/amhdmitx0/config
9. add gcp package.
   -> echo gcp_info > /sys/class/amhdmitx/amhdmitx0/debug

Change-Id: If8e566a18edead21d659ce20e77c475d83287887
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
2018-08-07 18:38:09 -07:00
Chris Wilson
997e954bb0 BACKPORT:dma-buf/fence: Fix lock inversion within dma-fence-array
Ages ago Rob Clark noted,

"Currently with fence-array, we have a potential deadlock situation.  If
we fence_add_callback() on an array-fence, the array-fence's lock is
acquired first, and in it's ->enable_signaling() callback, it will install
cbs on it's array-member fences, so the array-member's lock is acquired
second.

But in the signal path, the array-member's lock is acquired first, and
the array-fence's lock acquired second."

Rob proposed either extensive changes to dma-fence to unnest the
fence-array signaling, or to defer the signaling onto a workqueue. This
is a more refined version of the later, that should keep the latency
of the fence signaling to a minimum by using an irq-work, which is
executed asap.

Reported-by: Rob Clark <robdclark@gmail.com>
Suggested-by: Rob Clark <robdclark@gmail.com>
References: 1476635975-21981-1-git-send-email-robdclark@gmail.com
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Christian König <christian.koenig@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20171114162719.30958-1-chris@chris-wilson.co.uk
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
Change-Id: Ia08cb17615ff15b18c208cff2000d92344c9f399
2018-08-07 03:15:31 -07:00
Chris Wilson
3491d1638b BACKPORT: dma-buf/sync_file: Allow multiple sync_files to wrap a single dma-fence
Up until recently sync_file were create to export a single dma-fence to
userspace, and so we could canabalise a bit insie dma-fence to mark
whether or not we had enable polling for the sync_file itself. However,
with the advent of syncobj, we do allow userspace to create multiple
sync_files for a single dma-fence. (Similarly, that the sw-sync
validation framework also started returning multiple sync-files wrapping
a single dma-fence for a syncpt also triggering the problem.)

This patch reverts my suggestion in commit e241655373
("dma-buf/sync_file: only enable fence signalling on poll()") to use a
single bit in the shared dma-fence and restores the sync_file->flags for
tracking the bits individually.

Reported-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Fixes: f1e8c67123 ("dma-buf/sw-sync: Use an rbtree to sort fences in the timeline")
Fixes: e9083420bb ("drm: introduce sync objects (v4)")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170728212951.7818-1-chris@chris-wilson.co.uk
[astrachan: rediffed against changed context lines in 4.9]
Bug: 79383895
PD#170298 [1/3]
Change-Id: I70d1f19796c6cb33cd4c19e40276d7298aa4ba5d
Signed-off-by: Alistair Strachan <astrachan@google.com>
2018-08-07 03:14:50 -07:00
Yao.Liu
bb1ee7b299 video: support hdr new interface [3/4]
PD#170058: support hdr new interface

Change-Id: I45368f3651781078edbc4d86e5c2bb12afb53a7f
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
2018-08-07 02:44:52 -07:00
Yingyuan Zhu
39169ed5d0 dts: update the gpio key node for atom and sei210
PD#170502: dts: update the gpio key node for atom and sei210

Change-Id: Ib92167c36c2a756a784494da5dbe73a13c63dff0
Signed-off-by: Yingyuan Zhu <yingyuan.zhu@amlogic.com>
2018-08-06 23:51:31 -07:00
Victor Wan
7152bce7ca Revert "BACKPORT: dma-buf/sync_file: Allow multiple sync_files to wrap a single dma-fence"
This reverts commit 74fa0af473.

The commit 74fa0af caused GPU driver loading failed.

Change-Id: I255eb6b7a26e3b00e4f11489ece49896ff004d79
2018-08-07 14:46:15 +08:00
Victor Wan
cc7b1eac54 Merge branch 'android-4.9' into amlogic-4.9-dev
Signed-off-by: Victor Wan <victor.wan@amlogic.com>

 Conflicts:
	drivers/md/dm-bufio.c
	drivers/media/dvb-core/dvb_frontend.c
	drivers/usb/dwc3/core.c
	drivers/usb/gadget/function/f_fs.c
2018-08-07 14:43:24 +08:00
Xindong Xu
32b05b3c6a dts: add dtsi for system as root [1/9]
PD#170278: dts: add dtsi for system as root

Change-Id: Ie2eda798ac17425ddaf73d90bc04a3d9fdb74ade
Signed-off-by: Xindong Xu  <xindong.xu@amlogic.com>
2018-08-06 23:05:33 -07:00
Yi Zeng
8e6dad10fb mtd: spifc: add spifc support for txl
PD#171041: mtd: spifc: add spifc support for txl

Change-Id: I487161c6e85e3b232ed0c3891784b5a37f6d878c
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
2018-08-06 22:47:48 -07:00
MingLiang Dong
791bd6209e amvecm: dnlp coverity fix
PD#171026: amvecm: dnlp coverity fix

1. fix dnlp coverity
2. add kernel auto make dnlp_alg.ko

Change-Id: Idafc02e95655a9970ad778820b33c044e87bb767
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-08-06 21:30:30 -07:00
Lei Qian
41827da496 dts:txlx_t962x_r311_720p: fix commit error[1/1]
PD#170749:dts:txlx_t962x_r311_720p: fix commit error

Change-Id: Ie2f8398fab203e752657d54c77ac5ffbe56abebc
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
2018-08-06 19:56:10 -07:00
Lei Qian
71ef210ab0 dts:txl:sync fb config with txlx
PD#171168:dts:txl:sync fb config with txlx

Change-Id: I17f2521c5c571258c249ed042dc2978ebb21a5f9
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
2018-08-06 19:49:37 -07:00
Yong Qin
cb7b073391 cec: proble cec fail
PD#171266: cec: proble cec fail on sei 210 board

Change-Id: If45588072a6d700e0b90be4778cb73eed1deeb34
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2018-08-07 10:17:25 +08:00
Dezhi Kong
eb19549d8c di: optimize di pre mif config
PD#170980: di: optimize di pre mif config

1.add protect for di pre reset
2.add pre de done check when unreg
3.merge afbc hold line from alishan code
4.optimize pre mif enable sequence

Change-Id: I18851ad644aaee7c6c1d76c69f41a91f9599a36d
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
2018-08-06 02:22:59 -07:00
Lei Qian
8362dfe1c5 clk: fix txl crash issue
PD#169833: clk: fix txl crash issue

Revert "clk: fix 32bit system compatibility issue"

This reverts commit e39e646127.

Change-Id: I6c7af24e60a46bb386d64b794dd76fb2ec5db354
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
2018-08-06 00:47:55 -07:00
jiamin ma
244bb020db unifykey: add secure node
PD#168660: secure hdcp1.4 key

echo key_name > name
cat secure
to query whether a key is secure

Change-Id: If416fc8f2946176ecc956b73f1c9e77a55f7e57b
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
2018-08-05 23:52:00 -07:00
hongmin hua
b0f8ecf939 cec: add the port info and connect status for audio system
PD#170794: cec: add the port info and connect status for audio system

Change-Id: I433788d4f5fcbb3164f894ebc0f6827dd47b0633
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2018-08-05 23:48:27 -07:00
hongmin hua
4e76488f2c hdmirx: add lock for top sw reset & edid size protect [1/2]
PD#170713: hdmirx: add lock for top sw reset & edid size protect

Change-Id: I97502324d01d2e99d3a30bb1829affef5d2c123b
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2018-08-06 10:34:53 +08:00
MingLiang Dong
3281c4c10b amvecm: packet dnlp algorithm
PD#171026: amvecm: packet dnlp algorithm

Change-Id: I29dec857c1ca2eed47fd27f6cb3ec986daeaab6a
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-08-03 07:22:31 -07:00
Wencai You
f32a3e45bb mm: decrease DEFAULT_TVP_SIZE_FOR_4K and reserved-memory
PD#166821: decrease DEFAULT_TVP_SIZE_FOR_4K and reserved-memory

DEFAULT_TVP_SIZE_FOR_4K to 192M
codec_mm_cma to 208M
ion_reserved to 78M

Change-Id: I2fd38f40c242ef531f8cf2226822bed4b0250a4f
Signed-off-by: Wencai You <wencai.you@amlogic.com>
2018-08-03 07:12:24 -07:00
Renjun Xu
305e6776cd audio: fix adc3101 8ch PCM format support
PD#171085: fix adc3101 8ch PCM format support

For S400 & S420 board, please modify dts to enable adc3101 8ch PCM
please read following file:
Documentation/devicetree/bindings/amlogic/axg-adc3010-pcm.txt

Change-Id: I945441f80d269b167148ccf3d6c33093a20a4f2f
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
2018-08-03 04:20:53 -07:00
Shunzhou Jiang
e39e646127 clk: fix 32bit system compatibility issue
PD#169833: clk: fix 32bit system compatibility issue

Change-Id: I4033611ab0863448deb66d7ec1d06e645919fdc6
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
2018-08-03 03:06:16 -07:00
xuhua zhang
02bf0c02c0 vdin: add vdin output color depth selection from dts
PD#170749: vdin: add vdin output color depth selection

when vdin receive 4K && 50/60hz && 10bit data,
we can select vdin output color depth 8bit or 10bit from dts

Change-Id: I9c030b4769927dbf53880fad6c80707d7b282e86
Signed-off-by: xuhua zhang <xuhua.zhang@amlogic.com>
2018-08-03 03:05:03 -07:00
Conglin Guo
f8273ea4ec arm64: dts: txl: add decoder support
PD#170321: arm64: dts: txl: add decoder support

add ionvideo devicetree node

Change-Id: I5b628d86a64ff7920546e8122895cc048d8fc039
Signed-off-by: Conglin Guo <conglin.guo@amlogic.com>
2018-08-03 01:38:41 -07:00