Commit Graph

646576 Commits

Author SHA1 Message Date
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
Rongjun Chen
caafd46cc9 WIFI: fix wifi disable issue when suspend [2/2]
PD#168416: increase the mem size

Change-Id: Ib5fac2941b870c6d3dcca320adef17893bb1ec78
Signed-off-by: Rongjun Chen <rongjun.chen@amlogic.com>
2018-07-02 01:29:32 -07:00
Jianxin Qin
89d1d31ad7 usb: phy2: recovery analog status in PHY initial function
PD#164286: usb: phy2: recovery analog status during initial phase

If a USB device is enumerated done by Host, then the host system
reboot without power off, the AML USB PHY statue need to recovery,
or the USB device will be enumerated unsuccessfully.

Change-Id: If122e53b6a818be11be0ed6581ac485450244db0
Signed-off-by: Jianxin Qin <jianxin.qin@amlogic.com>
2018-07-02 01:27:37 -07:00
pengcheng chen
cf32797c87 osd: risk coverity bugs in osd module
PD#168947: osd: risk coverity bugs in osd module

Change-Id: Ia593f55c1debbd5dca271461336edb29123fae00
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-07-02 01:26:33 -07:00
nengwen.chen
7d524a96a5 atv_demod: Add ATV NICAM. [1/5]
PD#165624: Add ATV NICAM.

Change-Id: I2bcc018cd5ff7a611baa2f5473cfa1dbce28118d
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2018-07-02 01:20:14 -07:00
MingLiang Dong
eff1812ead vdin: fix hdmi input hlg video, vpp cannot get hlg flag
PD#167991: vdin: fix hdmi input hlg video, vpp cannot get hlg flag

Change-Id: I9071d6fd956ea70bcfde7cb781ec687fb0a81021
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-07-02 01:19:23 -07:00
Xing Wang
03d2d02b8c audio: support raw data even in touch sound[1/2]
PD#164738: audio: auge: check frddr src for each frddr

when output for raw data, disable the same frddrr src from other frddr

Change-Id: I930c84b0520ff404c6a323be79b26102699c817b
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2018-07-02 01:18:39 -07:00
Sunny Luo
90ef0a0549 spicc: fix clk polarity error of amlogic driver
PD#169301: spicc: fix clk polarity error of amlogic driver

Change-Id: Icb257e3394da94bd44cd78b63218161cfae63c69
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
2018-07-02 15:18:15 +08:00
Yong Qin
b5c4c9777a cec: fix coverity code warning
PD#166957: cec: fix code coverity warning

Change-Id: Ic0671b76c0b9f1a1bb25d67c6e5255cba2a0835c
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2018-07-01 23:52:51 -07:00
Kaifu Hu
50df8c4c7d hdmitx: parsing the env of frac_rate_policy [2/2]
PD#165862: hdmitx: parsing the env of frac_rate_policy

Uboot add the env frac_rate_policy,and kernel pasring that.

Change-Id: I4db60059738cd15fd32d2def5a4330f14b9fb118
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
2018-07-01 23:51:36 -07:00
Nian Jing
1f5488e2c6 tvafe: atv default not support ntsc 50
PD#167487: atv default not support ntsc 50

Change-Id: I723f2cf1b26056a4adef39eb76a22596ac878e69
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-07-01 23:28:03 -07:00
Nian Jing
c476e728b2 tvafe: add hardware snow for txhd
PD#167605: add hardware snow for txhd

Change-Id: Ibd16773ddb304c813ed62ee14e828b30806f158a
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-07-01 23:26:46 -07:00
Yi Zeng
04823ee9c2 mtd: avoid skip bad block in last part when add partition
PD#167168: mtd: avoid skip bad block in last part when add partition

Change-Id: Ice1e8246f22dd0d275c9ffdb64dcf9f165097bab
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
2018-07-01 23:24:28 -07:00
Hang Cheng
f8f829e66b hdmirx: optimize for devices which send signal slowly
PD#168494: hdmirx: optimize for devices which send signal slowly

1.avoid rapid phy reset interference signal recognition
2.add 3d information parse of edid

Change-Id: Iafa38bad6907f287c0e021d5fb32d11e43c489a0
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
2018-07-01 23:21:12 -07:00
Yong Qin
c50c2e7c6f cec: clean cec task function
PD#168415: cec: clean cec rx buffer check

	1.for new chip version, needn't check rx
	buffer

Change-Id: Ieb49508f2563fd6212f97163d0fbb5b73c5486c5
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2018-07-01 22:30:50 -07:00