Commit Graph

646590 Commits

Author SHA1 Message Date
Hanjie Lin
4e32d573ac perf_event: aml pmu interrupt issue fixup
PD#167574: perf_event: aml pmu interrupt issue fixup

amlogic arm pmu have a issue that all core's interrupts routes to
one gic SPI interrupt,
when some core raise a pmu interrupt(arm pmu counter overflow),
the global gic SPI interrupt will raise(default on cpu0),
and we can obtain core info which caused interrupt from
sys_cpu_status0 reg.

In global pmu interrupt handler we distinguish interrupts from other cpu,
then send a AML ipi interrupt and wait that cpu complete pmu interrupt.

Change-Id: I28ada689e5b94671c8cfb6189e46134c3c6804cd
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2018-07-10 10:29:22 +08:00
Brian Zhu
fb0db73474 ge2d: fix wrong init the clock overflow as 400MHZ for 805x
PD#168119: fix wrong init the clock overflow as 400MHZ for 805x

Change-Id: I26cd7c11c0aa026bc253bb40bf05ca96dac9555d
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2018-07-09 02:26:51 -07:00
Yue Wang
50dedb3321 pcie: fix check linkup timeout bug when pcie resume.
PD#169779: pcie: fix check linkup timeout bug when pcie resume.

Change-Id: Ia648c63447f101b71ae84dd960c0f414b80cbd32
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2018-07-09 00:50:39 -07:00
Nanxin Qin
53a66f642c media: adds the feature of the amvdec ports are based on v4l2.[1/2]
PD#153299:
1. amports has v4l for video decoding implemented upstream.
2. Only the decoding of h264 has been implemented at the moment.
3. the maximun resolution supports 1080p currently.
4. it is nv12 that the canvas data format of the decoder output.
5. the detailed description can be referred to wiki.
wiki: Media/The_V4L2_Amvdec_Ports_Instructions

Change-Id: Ie19311e1f44ae53b491500be9903f3d82c83b800
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2018-07-09 00:40:09 -07:00
Tong Li
367fdeee43 g12b_skt: disable the pcie function for g12b_skt.[1/1]
PD#169764: disable the pcie function for g12b_skt..

Change-Id: I48ac1c5f94a483ab299ce77f416e2d05a9d5bd62
Signed-off-by: Tong Li <tong.li@amlogic.com>
2018-07-08 22:44:43 -07:00
zhilei.wu
347fa9b90f osd: fix osd suspend fail issue
PD#167373: osd: fix osd suspend fail issue

Change-Id: I705cb3b4ec3226cb6bfcf7c94920116ac6540c2e
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
2018-07-08 22:32:13 -07:00
David Zeuthen
4efc1b8a17 ANDROID: AVB2: Enable avb2 driver [3/6]
PD#164745
PD#168166

ANDROID: AVB error handler to invalidate vbmeta partition.

If androidboot.vbmeta.device is set and points to a device with vbmeta
magic, this header will be overwritten upon an irrecoverable dm-verity
error. The side-effect of this is that the slot will fail to verify on
next reboot, effectively triggering the boot loader to fallback to
another slot. This work both if the vbmeta struct is at the start of a
partition or if there's an AVB footer at the end.

This code is based on drivers/md/dm-verity-chromeos.c from ChromiumOS.

Example:

 [    0.000000] Kernel command line: rootfstype=ext4 init=/init console=ttyS0,115200 androidboot.console=ttyS0 androidboot.hardware=uefi_x86_64 enforcing=0 androidboot.selinux=permissive androidboot.debuggable=1 buildvariant=eng dm="1 vroot none ro 1,0 2080496 verity 1 PARTUUID=6779df46-78f6-4c69-bf53-59bb1fbf126b PARTUUID=6779df46-78f6-4c69-bf53-59bb1fbf126b 4096 4096 260062 260062 sha1 4f76354c86e430e27426d584a726f2fbffecae32 7e4085342d634065269631ac9a199e1a43f4632c 1 ignore_zero_blocks" root=0xfd00 androidboot.vbmeta.device=PARTUUID=b865935d-38fb-4c4e-b8b4-70dc67321552 androidboot.slot_suffix=_a androidboot.vbmeta.device_state=unlocked androidboot.vbmeta.hash_alg=sha256 androidboot.vbmeta.size=3200 androidboot.vbmeta.digest=14fe41c2b3696c31b7ad5eae7877d7d188995e1ab122c604aaaf4785850b91f7 skip_initramfs
 [...]
 [    0.612802] device-mapper: verity-avb: AVB error handler initialized with vbmeta device: PARTUUID=b865935d-38fb-4c4e-b8b4-70dc67321552
 [...]
 [    1.213804] device-mapper: init: attempting early device configuration.
 [    1.214752] device-mapper: init: adding target '0 2080496 verity 1 PARTUUID=6779df46-78f6-4c69-bf53-59bb1fbf126b PARTUUID=6779df46-78f6-4c69-bf53-59bb1fbf126b 4096 4096 260062 260062 sha1 4f76354c86e430e27426d584a726f2fbffecae32 7e4085342d634065269631ac9a199e1a43f4632c 1 ignore_zero_blocks'
 [    1.217643] device-mapper: init: dm-0 is ready
 [    1.226694] device-mapper: verity: 8:6: data block 0 is corrupted
 [    1.227666] device-mapper: verity-avb: AVB error handler called for PARTUUID=b865935d-38fb-4c4e-b8b4-70dc67321552
 [    1.234308] device-mapper: verity-avb: invalidate_vbmeta: found vbmeta partition
 [    1.235848] device-mapper: verity-avb: invalidate_vbmeta: completed.
 [...]

Bug: 31622239
Test: Manually tested (other arch).
Change-Id: Idf6be32d6a3d28e15de9302aa26ad6a516d663aa
Signed-off-by: David Zeuthen <zeuthen@google.com>

Change-Id: I4b9229dbba3198ca55a00812e42762f424b59ec4
Signed-off-by: Mingyen Hung <mingyen.hung@amlogic.com>
Signed-off-by: Xindong Xu  <xindong.xu@amlogic.com>
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
2018-07-09 11:31:20 +08:00
Evoke Zhang
1241edd3bc backlight: ldim: optimize ldim algorithm for flicker issue
PD#167455: backlight: ldim: optimize ldim algorithm for flicker issue
also add driver and algorithm version recode.

Change-Id: I4b217f6d611c5689366170907db7e90b5a653a5e
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-07-06 01:11:57 -07:00
Sunny Luo
157284b916 clk: add CLK_DIVIDER_PROHIBIT_ZERO to prohibit value 0 of register.
PD#164751: clk: add CLK_DIVIDER_PROHIBIT_ZERO to prohibit value 0 of
register.

There is a possible error when spicc clk divider register value is 0.

It's easy and effective to resolve this problem with this flag.

Change-Id: I046f3ee6e35b98211a13be3390b847a5a75ec3c8
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
2018-07-05 22:51:45 -07:00
wenbiao zhang
fbc8bd75e6 dts: g12b audio config spdif_a
PD#169544: dts: g12b audio config spdif_a

Change-Id: Ie102bdd9bdb75274cf089a4409684dec5d3322ef
Signed-off-by: wenbiao zhang <wenbiao.zhang@amlogic.com>
2018-07-05 22:48:03 -07:00
Gongwei
5b851da867 dts: build: add S905X2 1g DDR3 support
PD#169633: dts: build: add S905X2 1g DDR3 dts support

Change-Id: Ib0480f45c167cf7fd11991bc79383328aa16c6b4
Signed-off-by: Gongwei Chen <gongwei.chen@amlogic.com>
2018-07-05 19:50:30 -07:00
wei wang
611f19dfb9 audio: set default value of gpio:AudioIn_Switch as spdif_in.[1/1]
PD#164102: there is no sound in spdif-in.

Change-Id: Ie26bde8a80b90ce67870669978874bb64e5cd5ed
Signed-off-by: wei wang <wei.wang@amlogic.com>
2018-07-05 19:18:10 -07:00
Matthew Shyu
fdb21d3613 crypto: Use arm64 crypto for android net cts tests
PD#169014:

1. fix race condition in Aml HW crypto driver
A flag is added in irq handler for distinguishing
the source of interrupt since all crypto modules
share the same dma thread

2. Enable arm64 crypto
Arm64 crypto is synchronous and thus is able to
pass net cts tests for UDP

Change-Id: I2fe4f44a0b386e1e5d234d0ba07d17ffdc3224a7
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
2018-07-05 06:42:46 -07:00
Yong Qin
2de19904f8 cec: modify pinmux
PD#169602: cec: for g12b add pinmux
	1.support transwich cec
	2.support snps cec

Change-Id: I21b79e402a8580e97604874f25790b7659d44906
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2018-07-05 05:47:44 -07:00
Yi Zhou
3f042f7a3f drm: Add Content Protection property
PD#158474: drm: Add Content Protection property

This patch adds a new optional connector property to allow userspace to enable
protection over the content it is displaying. This will typically be implemented
by the driver using HDCP.

The property is a tri-state with the following values:
- OFF: Self explanatory, no content protection
- DESIRED: Userspace requests that the driver enable protection
- ENABLED: Once the driver has authenticated the link, it sets this value

The driver is responsible for downgrading ENABLED to DESIRED if the link becomes
unprotected. The driver should also maintain the desiredness of protection
across hotplug/dpms/suspend.

If this looks familiar, I posted [1] this 3 years ago. We have been using this
in ChromeOS across exynos, mediatek, and rockchip over that time.

Changes in v2:
- Pimp kerneldoc for content_protection_property (Daniel)
- Drop sysfs attribute
Changes in v3:
- None
Changes in v4:
- Changed kerneldoc to recommend userspace polling (Daniel)
- Changed kerneldoc to briefly describe how to attach the property (Daniel)
Changes in v5:
- checkpatch whitespace noise
- Change DRM_MODE_CONTENT_PROTECTION_OFF to DRM_MODE_CONTENT_PROTECTION_UNDESIRED
Changes in v6:
- None

commit 24557865c8
Author: Sean Paul <seanpaul@chromium.org>
Date:   Mon Jan 8 14:55:37 2018 -0500

Change-Id: Ief031a46681d88369454ebbc56ed0bb203258ab5
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2018-07-05 05:19:57 -07:00
Shunzhou Jiang
3b447a7155 dts: dts: Fix g12b skt version can't boot up
PD#169593: dts: disable irblaster

Change-Id: I9fe0a3042b6de8db27c9f71d76c43852c88fb8ad
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
2018-07-05 05:16:33 -07:00
pengcheng chen
8330fd9a4a osd: fix osd freescale dummy caused black line issue
PD#169597: osd: fix osd freescale dummy caused black line issue

Change-Id: I47b76d707a8da20ac8eabfbd64e895c34c8dd599
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-07-05 16:38:31 +08:00
Nian Jing
590761c98f dts: cvbsout: add clk path config in dts
PD#169489: add clk path config in dts

Change-Id: Id1ee72c9acf4030bff2e9f1c05e1420fdbe52131
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-07-05 01:16:10 -07:00
Jian Hu
1346a36b3f clk: meson: remove CLK_SET_RATE_PARENT for spicc
PD#164751: clk: meson: remove CLK_SET_RATE_PARENT for spicc

If add CLK_SET_RATE_PARENT, set rate for spicc clock will
change clk81 rate.

Change-Id: If653169e26363e8015ae0547e899a9ea2b362a48
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-07-05 14:44:01 +08:00
Shunzhou Jiang
a66b3c3abc clk: clock: meet spicc clk closest and not include 1G
PD#164751: clock: fix set spi clock set error

Change-Id: I06b9c195441e7b057dbd9bf7d5b864cf8ae44aa1
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
2018-07-04 23:19:22 -07:00
Bencheng Jing
2d2870dd3f vlock: fix hdmi crash
PD#169483: vlock: fix hdmi crash

Change-Id: I0f2770f65789430f096e16637ba5b542bd670b16
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-07-04 22:36:52 -07:00
Nian Jing
838b871442 cvbsout: add cvbsout pal_m pal_n support
PD#169423: add cvbsout pal_m pal_n display mode support

Change-Id: I6d0458f5e6fccf31c52957d23da9fe0e76471213
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-07-04 22:35:50 -07:00
Weiguang Ruan
a01ad754e6 audio: set tdma slot = 1 for s420&s400 [3/3]
PD#169480: audio: set tdma slot = 1 for s420&s400

Change-Id: Id4fa1993866e91bebabe29553c66196c65890c97
Signed-off-by: Weiguang Ruan <Weiguang.ruan@amlogic.com>
2018-07-04 22:33:59 -07:00
rongrong zhou
07fd155411 codec_mm: alloc fail issue [1/2]
PD#167377

1. try_alloc_cma_size 4M -> 16M
2. dump free meminfo

Change-Id: Ideaf9f70067861d3b08b48336074b32213986cb6
Signed-off-by: rongrong zhou <rongrong.zhou@amlogic.com>
2018-07-04 06:33:38 -07:00
Hang Cheng
cda6cea915 hdmirx: add afifo threshold pass status for audio
PD#168492: hdmirx: add afifo threshold pass status for audio
when HDMI in,audio will check the fifo empty count to see
if the hdmirx fifo is empty,then audio hal will mute the dirty data
to avoid noise.

Change-Id: I37e19d1490c560ca9fb38ffa2c3c03793e81c9ae
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
2018-07-04 03:18:22 -07:00
Bencheng Jing
4df893b750 amvecm: add 3d lut for g12b
PD#165090: amvecm: add 3d lut for g12b

Change-Id: If75d72d727d59d032617414b67403653d0650612
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-07-04 03:16:06 -07:00
wenbiao zhang
2d766ad31b dts: add system led control for u200 buildroot
PD#169382: dts: add system led control for u200 buildroot

Change-Id: I56686581ff8f5e2e2d36cb91f77a418ae1f9479a
Signed-off-by: wenbiao zhang <wenbiao.zhang@amlogic.com>
2018-07-04 01:21:46 -07:00
liangzhuo.xie
36f3b8de0b dts: add w400 buildroot dts
PD#168687: add w400 buildroot dts

Change-Id: Ie2439ddee4df090014ec9bdb7b1f081a44233e0b
Signed-off-by: liangzhuo.xie <liangzhuo.xie@amlogic.com>
2018-07-04 01:21:23 -07:00
Qianggui Song
729bd5a565 arm64: dts: g12b: add focaltech touchpanel config
PD#169477: arm64: dts: g12b: add focaltech touchpanel config

Change-Id: Ia6ede5da68dad6994e537279b1e7edacf4203d63
Signed-off-by: Qianggui Song <qianggui.song@amlogic.com>
2018-07-04 01:11:14 -07:00
shuanglong.wang
b7d4bb38b6 amlvideo: remove some print info
PD#169021: remove some print info

remove some print info, for interlace frame, bottom pts will be
zero in single mode and multi intstance force interlace.

Change-Id: Ie1e3285e11cca37a6be98aecf55a927186cc727c
Signed-off-by: shuanglong.wang <shuanglong.wang@amlogic.com>
2018-07-04 00:32:07 -07:00
Evoke Zhang
42fa6d89ce lcd: fix code coverity
PD#168738: lcd: fix code coverity

Change-Id: I24eac191b7168a949c17fcb0478b4caee1453e4b
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-07-02 23:05:10 -07:00
Jian Hu
0851405bbd clk: txlx: add lock protection on meson_clk_measure()
PD#168934: clk: txlx: add lock protection on meson_clk_measure()

Fix encl_clk_msr equal zero when switch to hdmirx

Change-Id: I95bf5c3e4c0b45b2884a87a4112893b64766cda3
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-07-02 23:03:39 -07:00
Tong Li
628e972f0b s905d2_skt: reduce the Bootcomplete time for s905d2_skt.[2/2]
PD#169063: update dts for s905d2_skt.

Change-Id: I5825c1678da72b08aa5bf59e34e542811611a1f5
Signed-off-by: Tong Li <tong.li@amlogic.com>
2018-07-02 23:01:48 -07:00
hongmin hua
4d962126da cec: modfiy port info define for playback & audiosystem
PD#165588: cec: modfiy port info define for playback & audiosystem

Change-Id: I2305763107d2b99a767f688238fc51d4084d3b26
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
2018-07-02 22:59:58 -07:00
Nan Li
45503c456f sdio: optimize tuning retry.
PD#168926: add cmd_dly to tuning retry.

Change-Id: If78f557cd5302ee340dfc82bd269f51a7cce2abd
Signed-off-by: Nan Li <nan.li@amlogic.com>
2018-07-02 21:27:45 -07:00
Zongdong Jiao
6017f83390 hdmitx: reactive I2C after resume [1/1]
PD#168111: hdmitx: reactive I2C after resume
Sometimes, TX devices suspend and close HDMI 5V power, then this
may cause I2C clock/data falls and hungup I2C waiting states.

Change-Id: Ifd83c19f91a7023a43cebb5654157e207013556c
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2018-07-03 10:03:02 +08:00
Evoke Zhang
1702754d80 lcd: mipi-dsi: add operation_mode and read debug command support
PD#169193: lcd: mipi-dsi: add operation_mode and read debug command support

Change-Id: I5b1b781bc7700d0ced109c4e3ec171c91196604b
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-07-02 06:59:35 -07:00
Wencai You
4dcd32fac2 dts: gxm: add bt-dev for q201
PD#169292: add bt-dev for q201

Change-Id: I7039ce8934dab1f02477d64246e3639b6aa96fd0
Signed-off-by: Wencai You <wencai.you@amlogic.com>
2018-07-02 06:57:08 -07:00
Mingyen Hung
fa3d404e75 cec: modify dts pintrl selection to default
PD#158936: cec: modify dts pintrl selection to default

Fix kernel panic in aml_cec_probe() due to null pointer
reference on q200. (buildroot)

Change-Id: I926b22048cbdfe1524a2eda2410deac53aa4990e
Signed-off-by: Mingyen Hung <mingyen.hung@amlogic.com>
2018-07-02 06:11:50 -07:00
Bencheng Jing
8c00b82ad5 amvecm: rm satu_shift_by_con add hist_gamma_reset
PD#167359: amvecm: rm satu_shift_by_con  add hist_gamma_reset

Change-Id: I8b4a0eeaedbcd2b2569e7f0db2c7f5da37de7473
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-07-02 06:11:00 -07:00
MingLiang Dong
4527ef851e amvecm: use rdma load vpp reg
PD#166562: amvecm: use rdma load vpp reg

Change-Id: Id0b61be776d91e1b6270699aeb9b24fd43d1a67d
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-07-02 06:09:14 -07:00
Evoke Zhang
ac9b99c0c6 vout_serve: add vinfo fr_adj_type support for vlock
PD#168809: vout_serve: add vinfo fr_adj_type support for vlock

Change-Id: Ib5b7b06110008a98a6cf9b16e2f14775aa3f1053
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-07-02 06:08:23 -07:00
yicheng shen
087815fee2 hdmirx: mute the audio when get avmute signal
PD#169041: hdmirx: mute the audio when get avmute signal

Change-Id: I5941d48a793974f7292d6648a70d7e7842944170
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
2018-07-02 06:06:29 -07:00
Xing Wang
de960b11ed dts: audio: fix spdif_a share buffer with i2s
PD#160888: dts: audio: fix spdif_a share buffer with i2s

Change-Id: Id064feeaf20f3717e64f771ec1ae81b170000102
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2018-07-02 02:36:48 -07:00
Xing Wang
2ca7e4e50d audio: auge: only spdifin_event extcon for spdif_a in g12a
PD#165680: audio: auge: only spdifin_event extcon for spdif_a in g12a

Change-Id: Ie8486dc460a9452dc8a0f26a2a5acce83ee7bf26
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2018-07-02 02:35:43 -07:00
Bencheng Jing
ed3fb05f92 amvecm: clean coverity errors
PD#168792: amvecm: clean coverity errors

Change-Id: I1956c5e6b8bf3dff36e2820be4149f58dfa98f20
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-07-02 02:20:44 -07:00
Dezhi Kong
9a6929c193 vpp: adjust vpp skip line limit for bandwidth
PD#167737: VPP: adjust vpp skip line limit for bandwidth

Change-Id: I18c4325750a3c266936db849e52d938adf00adda
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
2018-07-02 02:15:55 -07:00
pengcheng chen
167a2142b6 osd: fix not afbc ddr bandwidth too high issue
PD#164816: osd: fix not afbc ddr bandwidth too high issue

Change-Id: I0108ccf8fd2564da2974e95d065811f9682d3bdc
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-07-02 01:45:55 -07:00
Evoke Zhang
d76dd736eb vout_serve: code coverity fix
PD#168799: vout_serve: code coverity fix

Change-Id: Id5358f4adc791980b14e2c22eff3443e9601a90e
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-07-02 01:36:43 -07:00
sky zhou
fa6fba6130 DRM: move irq request after crtc created.
PD#168985: fix vblank irq panic when crtc not created.

Change-Id: I369a8a0159549001ae0ef216391be730664a4690
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
2018-07-02 01:32:52 -07:00