platform/kernel/linux-amlogic.git
6 years agomm: decrease DEFAULT_TVP_SIZE_FOR_4K and reserved-memory
Sandy Luo [Tue, 28 Aug 2018 08:38:46 +0000 (16:38 +0800)]
mm: decrease DEFAULT_TVP_SIZE_FOR_4K and reserved-memory

PD#166821: decrease DEFAULT_TVP_SIZE_FOR_4K and reserved-memory

Change-Id: I314d4c2e2fc6cbb2bb339c79bbcf27600adc9c69
Signed-off-by: Sandy Luo <sandy.luo@amlogic.com>
6 years agoUSB: clean the coverity errors of usb module
qi duan [Thu, 23 Aug 2018 08:56:35 +0000 (16:56 +0800)]
USB: clean the coverity errors of usb module

PD#166793: code defects in usb part

Change-Id: I196d293c9e0147c60dd493fa36f896996bafb312
Signed-off-by: qi duan <qi.duan@amlogic.com>
6 years agotsync: delete some frequent debug info
Cheng Tong [Mon, 27 Aug 2018 06:46:05 +0000 (14:46 +0800)]
tsync: delete some frequent debug info

PD#172598: tsync delete some frequent debug info

Change-Id: Ibcb708375842f4ef1dff5ab6333387d1f3ff3b2d
Signed-off-by: Cheng Tong <cheng.tong@amlogic.com>
6 years agoMerge "irblaster: clean the coverity errors of blaster module" into amlogic-4.9-dev
Jianxin Pan [Mon, 27 Aug 2018 08:47:30 +0000 (01:47 -0700)]
Merge "irblaster: clean the coverity errors of blaster module" into amlogic-4.9-dev

6 years agoRevert "arm64: select HAVE_ARCH_VMAP_STACK by default [2/3]"
Jianxin Pan [Mon, 27 Aug 2018 08:01:08 +0000 (01:01 -0700)]
Revert "arm64: select HAVE_ARCH_VMAP_STACK by default [2/3]"

This reverts commit d560a7683c108df8d1b420f9c02a60e3d7e63c9d.

Change-Id: I4b9dc63a986afbffd81be991dc782916feb95270
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
6 years agoirblaster: clean the coverity errors of blaster module
Yu Tu [Mon, 27 Aug 2018 05:44:00 +0000 (13:44 +0800)]
irblaster: clean the coverity errors of blaster module

PD#166793: code defects in irblaster part

Change-Id: I3aed8bd61dfa0dfdcf68a1a43b0c82caf8dff091
Signed-off-by: Yu Tu <yu.tu@amlogic.com>
6 years agodv: change the pps bypass logic when dv on for 962e
zhilei.wu [Wed, 22 Aug 2018 09:11:28 +0000 (17:11 +0800)]
dv: change the pps bypass logic when dv on for 962e

PD#168736: dv: change the pps bypass logic when dv on for 962e

Change-Id: Ib9ee85f975d63e2124f87bd3e0507095ab659760
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
6 years agodv: SDR2HDR solution was moved to dovi.ko
zhilei.wu [Wed, 22 Aug 2018 08:04:05 +0000 (16:04 +0800)]
dv: SDR2HDR solution was moved to dovi.ko

PD#170257: dv: SDR2HDR solution was moved to dovi.ko

Change-Id: I958d7ee272389c0ed266f0d5dab3ae9ef54485b9
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
6 years agovpp: pixel at top/left corner has wrong color
zhilei.wu [Wed, 22 Aug 2018 07:59:33 +0000 (15:59 +0800)]
vpp: pixel at top/left corner has wrong color

PD#168736: vpp: pixel at top/left corner has wrong color

Change-Id: Icddce7c51d840b92cf57a6fd6a35e3e442cf1258
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
6 years agodv: send bypass_el event to dvbldec
zhilei.wu [Wed, 22 Aug 2018 06:55:37 +0000 (14:55 +0800)]
dv: send bypass_el event to dvbldec

PD#163750: dv: send bypass_el event to dvbldec

Change-Id: Ide0b29bae17a47cd1477d31b0679efba25340b5a
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
6 years agogpio_keypad: Fix key reporting [1/1]
Dmitry Shmidt [Thu, 16 Aug 2018 00:44:14 +0000 (17:44 -0700)]
gpio_keypad: Fix key reporting [1/1]

PD#172258: pio_keypad: Fix key reporting [1/1]

the following issues have been fixed :
1. didn't report any keys to userspace.
2. the push down of key is reported as push up.
3. no event is reported when press key for the first time.

adjust the key event value by changing the gpio flag for
atom board, as follows:
1. the event value "0" is replaced  to "1" when push down.
2. the event value "1" is replaced  to "0" when push up.

Change-Id: Ia207506df25ea604bce4b6ae9573a981fe664061
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Signed-off-by: Tellen Yu <tellen.yu@amlogic.com>
Signed-off-by: Yingyuan Zhu <yingyuan.zhu@amlogic.com>
6 years agotee: G12B: workaroud for system stability.
Yan Wang [Fri, 17 Aug 2018 11:03:13 +0000 (19:03 +0800)]
tee: G12B: workaroud for system stability.

PD#170391

G12B GTVs version generate SErr exception when BL32/TA run on A73.
Set BL32/TA affinity to core0(A53) temporarily.

Change-Id: Ib1326914ef164f379c6920b5643b07e4e152b30e
Signed-off-by: Yan Wang <yan.wang@amlogic.com>
6 years agodts: audio: fix spdif_a share buffer with i2s
Jian Xu [Fri, 24 Aug 2018 02:50:44 +0000 (10:50 +0800)]
dts: audio: fix spdif_a share buffer with i2s

PD#160888: dts: audio: fix spdif_a share buffer with i2s

Change-Id: I61f8f69d613d7bd1d52de173a13c43ceae21b80a
Signed-off-by: Sandy Luo <sandy.luo@amlogic.com>
6 years agodi: remove unused txl register of dump di reg/mif
wenfeng.guo [Wed, 15 Aug 2018 08:29:35 +0000 (16:29 +0800)]
di: remove unused txl register of dump di reg/mif

PD#171757: di: remove unused txl register of dump di reg/mif

1.add new debugfs:
cat /sys/kernel/debug/di/dumpreg
cat /sys/kernel/debug/di/dumpmif
2.move di_state to deinterlace_dbg

Change-Id: Ic183abd793b170519ccc20e9a546efdfd531c469
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
6 years agoethernet: clean the coverity errors of eth module
qi duan [Thu, 23 Aug 2018 10:00:35 +0000 (18:00 +0800)]
ethernet: clean the coverity errors of eth module

PD#166793: code defects in eth part

Change-Id: I5e9a4bc9ff3c89a2fff8fa000d2c33dc87f2492c
Signed-off-by: qi duan <qi.duan@amlogic.com>
6 years agoUART: clean the coverity errors of UART module
qi duan [Thu, 23 Aug 2018 09:14:11 +0000 (17:14 +0800)]
UART: clean the coverity errors of UART module

PD#166793: code defects in UART part

Change-Id: Id2a379cc4d0ae7d463d835cad01be83793dba4ca
Signed-off-by: qi duan <qi.duan@amlogic.com>
6 years agoaudio: solve av out voltage lower issue
Lianlian Zhu [Tue, 21 Aug 2018 14:05:09 +0000 (22:05 +0800)]
audio: solve av out voltage lower issue

PD#171873

Change-Id: I2fb1e3a70b3fa71b0ec4d5f8c528fead1e5cd009
Signed-off-by: Lianlian Zhu <lianlian.zhu@amlogic.com>
6 years agoemmc: fixed the timeout of flushing the cache
Long Yu [Mon, 11 Jun 2018 03:08:16 +0000 (11:08 +0800)]
emmc: fixed the timeout of flushing the cache

PD#168102: emmc: fixed the timeout of flushing the cache

Change-Id: I122ace6bd5fa7b1b74de642652a76df9dfb62873
Signed-off-by: Long Yu <long.yu@amlogic.com>
6 years agoaudio: fixed frequency responds curve test fail[1/2]
Zhe Wang [Tue, 21 Aug 2018 08:28:02 +0000 (16:28 +0800)]
audio: fixed frequency responds curve test fail[1/2]

PD#168797: -change hw resample filter parameters with input sr
    in hdmiin and spdifin source

   -optimize filter parameters

Change-Id: Ie48d55446b22b8f3dceff8be404ad52d7820f6e8
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
6 years agohdmirx: add ddc idle detection before edid filling
Lei Yang [Wed, 8 Aug 2018 03:11:18 +0000 (11:11 +0800)]
hdmirx: add ddc idle detection before edid filling

PD#171215: hdmirx: add ddc idle detection before edid filling

1. add ddc idle detection
2. increase hpd low wait time to 350ms

Change-Id: I59e3bc52af09b41b8567a93d595c2b52233f170a
Signed-off-by: Lei Yang <lei.yang@amlogic.com>
6 years agolcd: clear mute after driver reset
Evoke Zhang [Tue, 21 Aug 2018 05:12:33 +0000 (13:12 +0800)]
lcd: clear mute after driver reset

PD#172121: lcd: clear mute after driver reset
also update CONFIG AML_VOUT_FRAMERATE_AUTOMATION to AMLOGIC_VOUT_SERVE

Change-Id: I65309c6c3b43fabc4e95269114ad22d18d360a41
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agolcd: update optical info struct name
Evoke Zhang [Tue, 26 Jun 2018 02:16:55 +0000 (10:16 +0800)]
lcd: update optical info struct name

PD#171986: lcd: update optical info struct name

Change-Id: I17b4381b7011a48491d3e127ceba8b08b7dcd197
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agotvafe: add Variable initialization
Nian Jing [Tue, 21 Aug 2018 02:10:31 +0000 (10:10 +0800)]
tvafe: add Variable initialization

PD#172153: fix complie error for some GCC version

Change-Id: I0f09bf4097dfea278c63d69e789ee99b016e84b2
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agothermal: clean the coverity errors of thermal module
zhiqiang.liang [Tue, 21 Aug 2018 08:53:08 +0000 (16:53 +0800)]
thermal: clean the coverity errors of thermal module

PD#166793: code defects in thermal part

Change-Id: Icd970eced2ed3bcd76a8baf15bf7b885d63d8d6a
Signed-off-by: zhiqiang.liang <zhiqiang.liang@amlogic.com>
6 years agoClk: clean the coverity errors of clk module
zhiqiang.liang [Tue, 21 Aug 2018 08:44:23 +0000 (16:44 +0800)]
Clk: clean the coverity errors of clk module

PD#166793: code defects in clk part

Change-Id: Iee2753552c6f345ea78329833415e607b141d188
Signed-off-by: zhiqiang.liang <zhiqiang.liang@amlogic.com>
6 years agolcd: lcd_extern: add two i2c address support
Evoke Zhang [Fri, 10 Aug 2018 05:58:03 +0000 (13:58 +0800)]
lcd: lcd_extern: add two i2c address support

PD#169249: lcd: lcd_extern: add two i2c address support

Change-Id: Ic67304cd32768f5800b3702c57527e152bb71916
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agolcd: add auto test for panel color bar
Evoke Zhang [Thu, 19 Apr 2018 08:10:34 +0000 (16:10 +0800)]
lcd: add auto test for panel color bar

PD#169249: lcd: add auto test for panel color bar
also add gp0_pll clktree for clk_path 1 used

Change-Id: I78d1e42e68bfb8f294247053fdae4bb09fc3077a
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agomm: reduce codec cma pool size for 1GB platform [3/3]
tao zeng [Thu, 16 Aug 2018 06:44:39 +0000 (02:44 -0400)]
mm: reduce codec cma pool size for 1GB platform [3/3]

PD#171358

Memory will allocation fail for driver and kernel on 1GB platform
sometimes. But meminfo show that there are many free CMA pages,
which can't be used by kernel and driver. High percentage of CMA
pages reducec memory space for unmovable pages. We need to reduce
cma pool size for small memory platform.

Change-Id: I671d68f54209e7d557b6e33e2100af0ff4da2073
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
6 years agoarm64: select HAVE_ARCH_VMAP_STACK by default [2/3]
tao zeng [Thu, 16 Aug 2018 06:42:12 +0000 (02:42 -0400)]
arm64: select HAVE_ARCH_VMAP_STACK by default [2/3]

PD#171358

On arm64, task stack is 16KB and need order 2 when create a task.
It's easy get a failed allocation result if memory is fragmentation
after long time of using. Using vmap to allocate task stack can help
to avoid this problem.

Change-Id: I3a8a3fbf626eb30e0e547ed0605be02bb3391e5a
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
6 years agohdmirx: add feature of disable specific port
Hang Cheng [Fri, 22 Jun 2018 11:47:20 +0000 (19:47 +0800)]
hdmirx: add feature of disable specific port

PD#162498: hdmirx: add feature of disable specific port

1.disable termination and hpd of specific port to avoid
interference to adjacent non-hdmi source
2.use dts to control this feature, disable feature by default
3.side effect: cec function of disabled port will not work

Change-Id: Ie52b187185277ee4e900b4de6db1da0da65bb1b9
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
6 years agohdmi: pkt: pktfifo not work after switch src
Yong Qin [Mon, 20 Aug 2018 08:58:04 +0000 (16:58 +0800)]
hdmi: pkt: pktfifo not work after switch src

PD#172097: hdmi: pktfifo not work after switch src

1.pktinfo not work when exit hdmi source and re-enter
hdmi source.

Change-Id: I51f08529f38e93158e5c52a686472c5c3577e66b
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
6 years agoinput: gpio_key: add some missing code [1/1]
xiaoliang.wang [Tue, 14 Aug 2018 22:23:11 +0000 (18:23 -0400)]
input: gpio_key: add some missing code [1/1]

PD#171750: google b/112555582

add some missing code for send keyevent

Change-Id: I2586a0cd163c02b483657ade4e1a998d54f379d8
Signed-off-by: Shuide Chen <shuide.chen@amlogic.com>
Signed-off-by: xiaoliang.wang <xiaoliang.wang@amlogic.com>
6 years agoclk: mpll: fix audio not sound issue
Shunzhou Jiang [Mon, 20 Aug 2018 02:14:10 +0000 (10:14 +0800)]
clk: mpll: fix audio not sound issue

PD#170386: clk: fix audio not sound

Change-Id: I0396c6e2447162995964914fa7adb9f35ff651f0
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
6 years agoVIDEO_PTS: don't used the hardware register
Zhi Zhou [Mon, 16 Jul 2018 03:29:16 +0000 (11:29 +0800)]
VIDEO_PTS: don't used the hardware register

PD#169889: don't used harware vpts/apts for avsync.

becuase this apts/vpts is hardware irrelevant.
so if we need this register, we need power on
the parser,but it is irrelevant in ATV/hdmi-in
mode.

Change-Id: I4bd218c228516c974027b61c3a094b536913312e
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
6 years agoinit: wait emmc ready before root
Yonghui Yu [Thu, 16 Aug 2018 16:11:35 +0000 (00:11 +0800)]
init: wait emmc ready before root

PD#171658: init: wait emmc ready before root

A temporary ugly patch

Change-Id: I9a75fabf7460f92b0b9ae51992ac0d3c964798d2
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
6 years agoramdump: fix type error for status of watch dog node [1/1]
tao zeng [Fri, 17 Aug 2018 06:36:54 +0000 (14:36 +0800)]
ramdump: fix type error for status of watch dog node [1/1]

PD#165764

Change-Id: Ib3a92525eedeedaa7a451214279d526bb3daa71a
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
6 years agohdmi: cec: switch hdmi port cec not work
Yong Qin [Mon, 13 Aug 2018 11:48:58 +0000 (19:48 +0800)]
hdmi: cec: switch hdmi port cec not work

PD#171014: cec: hdmi source cec not work

Change-Id: I2198eb4f9bc17f9909b9d693b4f12945240a7239
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
6 years agodi: fix compile error when disable di
frank zhao [Wed, 1 Aug 2018 03:31:55 +0000 (23:31 -0400)]
di: fix compile error when disable di

PD#171633: di: fix compile error when disable di

Change-Id: Ib7ff39d05b8575fc5094494611d698e81f470644
Signed-off-by: frank zhao <frank.zhao@amlogic.com>
6 years agovideo: add hdr metadata and color aspects support
jintao xu [Tue, 14 Aug 2018 11:10:23 +0000 (19:10 +0800)]
video: add hdr metadata and color aspects support

PD#167533

add hdr metadata and color aspects support
fix cts below test cases:
android.media.cts.DecoderTest#testH265HDR10StaticMetadata
android.media.cts.DecoderTest#testH264ColorAspects
android.media.cts.DecoderTest#testH265ColorAspects
android.media.cts.DecoderTest#testMPEG2ColorAspectsTV

Change-Id: I7a7f3b3d7ec1079c4b4094e3c6b9a14c5fe9d791
Signed-off-by: peter wang <peter.wang@amlogic.com>
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
6 years agothermal: support A32 driver
Huan Biao [Thu, 2 Aug 2018 07:47:58 +0000 (15:47 +0800)]
thermal: support A32 driver

PD#169652: thermal: support A32 driver

Change-Id: Ic0d86782f1b10743435588080c1a1548ccd80e04
Signed-off-by: Huan Biao <huan.biao@amlogic.com>
6 years agodeinterlace: txl: fix di abnormal when dtv on inverted screen
Jihong Sui [Wed, 15 Aug 2018 07:44:28 +0000 (15:44 +0800)]
deinterlace: txl: fix di abnormal when dtv on inverted screen

PD#171587: txl: fix di abnormal when dtv on inverted screen

Change-Id: I38a1d2c73b0dd961739a010b36e06bb1f51e7be8
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
6 years agohdmirx: add new hdcp14 key configuration method
yicheng shen [Tue, 26 Jun 2018 03:02:22 +0000 (11:02 +0800)]
hdmirx: add new hdcp14 key configuration method

PD#168660: hdmirx: add new hdcp14 key configuration method

set hdcp1.4 key via secure OS to protect the key

Change-Id: If455aebe1c7fb65b4b16e8cf3ba7a70cf20702ac
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
6 years agoclocksource: remove LOCAL_TIMER config in meson64_a32
Ao Xu [Wed, 15 Aug 2018 08:22:16 +0000 (04:22 -0400)]
clocksource: remove LOCAL_TIMER config in meson64_a32

PD#169652: clocksource: remove LOCAL_TIMER config in meson64_a32

use soc timer instead of local timer

Change-Id: Ie2fd614cc6978496474fefcd39f0f21136197f34
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
6 years agoboard: add A32 support for gxl&txlx
Ao Xu [Thu, 2 Aug 2018 08:50:14 +0000 (16:50 +0800)]
board: add A32 support for gxl&txlx

PD#169652: board: add A32 support for gxl&txlx

add dts for gxl&txlx

Change-Id: Id2e79c9d2611bc2fb84ee344568ed9276566e872
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
6 years agoclk: fix 32bit system compatibility issue
Shunzhou Jiang [Fri, 6 Jul 2018 05:02:34 +0000 (13:02 +0800)]
clk: fix 32bit system compatibility issue

PD#169833: clk: fix 32bit system compatibility issue

Change-Id: I3ded0352c88267275cb1f128f1bfb79618f2226c
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
6 years agodrm: Create a format/modifier blob
Ben Widawsky [Mon, 24 Jul 2017 03:46:39 +0000 (20:46 -0700)]
drm: Create a format/modifier blob

Updated blob layout (Rob, Daniel, Kristian, xerpi)

v2:
* Removed __packed, and alignment (.+)
* Fix indent in drm_format_modifier fields (Liviu)
* Remove duplicated modifier > 64 check (Liviu)
* Change comment about modifier (Liviu)
* Remove arguments to blob creation, use plane instead (Liviu)
* Fix data types (Ben)
* Make the blob part of uapi (Daniel)

v3:
Remove unused ret field.
Change i, and j to unsigned int (Emil)

v4:
Use plane->modifier_count instead of recounting (Daniel)

v5:
Rename modifiers to modifiers_property (Ville)
Use sizeof(__u32) instead to reflect UAPI nature (Ville)
Make BUILD_BUG_ON for blob header size

Change-Id: Ibb2490b0510cbae9b5f4252483f8b1531fddf73f
Cc: Rob Clark <robdclark@gmail.com>
Cc: Kristian H. Kristensen <hoegsberg@gmail.com>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Daniel Stone <daniels@collabora.com> (v2)
Reviewed-by: Liviu Dudau <liviu@dudau.co.uk> (v2)
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> (v3)
Signed-off-by: Daniel Stone <daniels@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170724034641.13369-2-ben@bwidawsk.net
6 years agodrm: Plumb modifiers through plane init
Ben Widawsky [Mon, 24 Jul 2017 03:46:38 +0000 (20:46 -0700)]
drm: Plumb modifiers through plane init

This is the plumbing for supporting fb modifiers on planes. Modifiers
have already been introduced to some extent, but this series will extend
this to allow querying modifiers per plane. Based on this, the client to
enable optimal modifications for framebuffers.

This patch simply allows the DRM drivers to initialize their list of
supported modifiers upon initializing the plane.

v2: A minor addition from Daniel

v3:
* Updated commit message
* s/INVALID/DRM_FORMAT_MOD_INVALID (Liviu)
* Remove some excess newlines (Liviu)
* Update comment for > 64 modifiers (Liviu)

v4: Minor comment adjustments (Liviu)

v5: Some new platforms added due to rebase

v6: Add some missed plane inits (or maybe they're new - who knows at
this point) (Daniel)

Change-Id: I717e6240f729902af34c1419140bbf0b8c0a421d
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Daniel Stone <daniels@collabora.com> (v2)
Reviewed-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Daniel Stone <daniels@collabora.com>
6 years agodrm: Nuke modifier[1-3]
Ville Syrjälä [Wed, 16 Nov 2016 11:33:16 +0000 (13:33 +0200)]
drm: Nuke modifier[1-3]

It has been suggested that having per-plane modifiers is making life
more difficult for userspace, so let's just retire modifier[1-3] and
use modifier[0] to apply to the entire framebuffer.

Obviosuly this means that if individual planes need different tiling
layouts and whatnot we will need a new modifier for each combination
of planes with different tiling layouts.

For a bit of extra backwards compatilbilty the kernel will allow
non-zero modifier[1+] but it require that they will match modifier[0].
This in case there's existing userspace out there that sets
modifier[1+] to something non-zero with planar formats.

Mostly a cocci job, with a bit of manual stuff mixed in.

@@
struct drm_framebuffer *fb;
expression E;
@@
- fb->modifier[E]
+ fb->modifier

@@
struct drm_framebuffer fb;
expression E;
@@
- fb.modifier[E]
+ fb.modifier

Change-Id: Iebf536e81ea538e157d57eebed1ae3f9b3d912ce
Cc: Kristian Høgsberg <hoegsberg@gmail.com>
Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Cc: dczaplejewicz@collabora.co.uk
Suggested-by: Kristian Høgsberg <hoegsberg@gmail.com>
Acked-by: Ben Widawsky <ben@bwidawsk.net>
Acked-by: Daniel Stone <daniels@collabora.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1479295996-26246-1-git-send-email-ville.syrjala@linux.intel.com
6 years agodrm: Extract drm_mode_config.[hc]
Daniel Vetter [Mon, 14 Nov 2016 11:58:23 +0000 (12:58 +0100)]
drm: Extract drm_mode_config.[hc]

And shuffle the kernel-doc structure a bit since drm_crtc.[hc] now
only contains CRTC-related functions and structures.

v2:
- rebase onto drm-misc
- don't forget to move drm_mode_config_cleanup.
- move 2 internal decls under the right heading (Chris)

Change-Id: Ia84e8ea0df4be681c2e6a7856e11ec4bf7edfcdb
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
6 years agodrm: add helper for printing to log or seq_file
Rob Clark [Sat, 5 Nov 2016 15:08:07 +0000 (11:08 -0400)]
drm: add helper for printing to log or seq_file

Sometimes it is nice not to duplicate equivalent printk() and
seq_printf() code.

v2: simplify things w/ va_format, and use dev_printk, docs

Change-Id: Idad43e786b5007cc4c794afaf04dd3ad03d58941
Signed-off-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1478358492-30738-3-git-send-email-robdclark@gmail.com
6 years agodrm_fourcc: Document linear modifier
Daniel Vetter [Wed, 9 Nov 2016 12:36:36 +0000 (13:36 +0100)]
drm_fourcc: Document linear modifier

Not setting the fb modifiers flag is something different from setting
the fb modifiers to 0 (which means explicitly linear). We kinda failed
to document that properly. Spotted by Kristian.

Change-Id: I165c4b32bcd2c329786aa05fac268b066a9af159
Cc: hoegsberg@google.com
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1478694996-4200-1-git-send-email-daniel.vetter@ffwll.ch
6 years agodrm: WARN when calling drm_format_info() for an unsupported format
Laurent Pinchart [Mon, 17 Oct 2016 22:41:12 +0000 (01:41 +0300)]
drm: WARN when calling drm_format_info() for an unsupported format

The format helpers have historically treated unsupported formats as part
of the default case, returning values that are likely wrong. We can't
change this behaviour now without risking breaking drivers in difficult
to detect ways, but we can WARN on unsupported formats to catch faulty
callers.

The only exception is the framebuffer_check() function that calls
drm_format_info() to validate the format passed from userspace. This is
a valid use case that shouldn't generate a warning.

Change-Id: I57ea2b59765006e9f160f0e85e77f019ab6b977a
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1476744081-24485-5-git-send-email-laurent.pinchart@ideasonboard.com
6 years agodrm: Implement the drm_format_*() helpers as drm_format_info() wrappers
Laurent Pinchart [Mon, 17 Oct 2016 22:41:10 +0000 (01:41 +0300)]
drm: Implement the drm_format_*() helpers as drm_format_info() wrappers

Turn the drm_format_*() helpers into wrappers around the drm_format_info
lookup function to centralize all format information in a single place.

Change-Id: I599e5a857b267f5ef24746991b7f3c25a9d92479
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1476744081-24485-3-git-send-email-laurent.pinchart@ideasonboard.com
6 years agodrm/edid: Rename local variable block to edid
Chris Wilson [Mon, 17 Oct 2016 08:35:12 +0000 (09:35 +0100)]
drm/edid: Rename local variable block to edid

The "block" variable points to the entire edid, not individual blocks
despite it being named such.

Change-Id: Ief86411390d9368c6e179a65e11ffc0065fd3b7f
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161017083514.21772-1-chris@chris-wilson.co.uk
6 years agodrm/fb-helper: reject any changes to the fbdev
Stefan Agner [Tue, 11 Oct 2016 23:15:04 +0000 (16:15 -0700)]
drm/fb-helper: reject any changes to the fbdev

The current fbdev emulation does not allow to push back changes in
width, height or depth to KMS, hence reject any changes with an
error. This makes sure that fbdev ioctl's fail properly and user
space does not assume that changes succeeded.

Change-Id: Iaefb728b04d4599ef5bd6f32b37dd9dcab830989
Signed-off-by: Stefan Agner <stefan@agner.ch>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161011231504.17688-1-stefan@agner.ch
6 years agodrm: Use drm_format_info() in DRM core code
Laurent Pinchart [Mon, 17 Oct 2016 22:41:11 +0000 (01:41 +0300)]
drm: Use drm_format_info() in DRM core code

Replace calls to the drm_format_*() helper functions with direct use of
the drm_format_info structure. This improves efficiency by removing
duplicate lookups.

Change-Id: I731a8def0d5835d0488e3a100794a09790f4f9fc
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1476744081-24485-4-git-send-email-laurent.pinchart@ideasonboard.com
6 years agodrm: Centralize format information
Laurent Pinchart [Mon, 17 Oct 2016 22:41:09 +0000 (01:41 +0300)]
drm: Centralize format information

PD#170175: drm: Centralize format information

Various pieces of information about DRM formats (number of planes, color
depth, chroma subsampling, ...) are scattered across different helper
functions in the DRM core. Callers of those functions often need to
access more than a single parameter of the format, leading to
inefficiencies due to multiple lookups.

Centralize all format information in a data structure and create a
function to look up information based on the format 4CC.

Change-Id: I25dc415450c89e5eb69726b3dda521c5800c4d68
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1476744081-24485-2-git-send-email-laurent.pinchart@ideasonboard.com
6 years agodrm: Use u64 for intermediate dotclock calculations
Chris Wilson [Fri, 21 Oct 2016 14:15:40 +0000 (15:15 +0100)]
drm: Use u64 for intermediate dotclock calculations

We have reached the era where monitor bandwidths now exceed 31bits in
frequency calculations, though as we stored them in kHz units we are
safe from overflow in the modelines for some time.

[   48.723720] UBSAN: Undefined behaviour in ../drivers/gpu/drm/drm_modes.c:325:49
[   48.726943] signed integer overflow:
[   48.728503] 2240 * 1000000 cannot be represented in type 'int'

Change-Id: Ib0ab1c82e0f5fb9d11244a5dbc53b565e1179127
Reported-by: Martin Liška <marxin.liska@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98372
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161021141540.26837-1-chris@chris-wilson.co.uk
6 years agodrm: Add drm_rotation_90_or_270()
Ville Syrjälä [Mon, 26 Sep 2016 16:30:46 +0000 (19:30 +0300)]
drm: Add drm_rotation_90_or_270()

We have intel_rotation_90_or_270() in i915 to check if the rotation is
90 or 270 degrees. Similar checks are elsewhere in drm, so let's move
the helper into a central place and use it everwhere.

v2: Drop the BIT()
    Convert all new intel_rotation_90_or_270() calls
    Deal with superfluous code shuffling

Change-Id: I84d48ebfa010f7c28fad6e492fdda2bddd305ccf
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v1)
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1474907460-10717-2-git-send-email-ville.syrjala@linux.intel.com
6 years agoRevert "Fix up non-directory creation in SGID directories"
Ao Xu [Fri, 10 Aug 2018 06:14:25 +0000 (02:14 -0400)]
Revert "Fix up non-directory creation in SGID directories"

This reverts commit d2c7c52431819aa05d76fae77bb3f95dd0955da1.

Change-Id: I096cd7fd49ccad4bd032bb365211930fa1aa74d4
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
6 years agocodec_mm: fix some coverity error.
Peng Yixin [Fri, 27 Jul 2018 02:18:54 +0000 (10:18 +0800)]
codec_mm: fix some coverity error.

PD#170543: codec_mm: fix some coverity error.

fix some coverity error

Change-Id: Idf234f08bc6d7522fdeb04c14956d046c94012c4
Signed-off-by: Peng Yixin <yixin.peng@amlogic.com>
6 years agoatv_demod: add atv all band scan [8/8]
nengwen.chen [Fri, 10 Aug 2018 11:46:10 +0000 (19:46 +0800)]
atv_demod: add atv all band scan [8/8]

PD#171216: add atv all band scan

Change-Id: If5c0664a25206b9a330d05af04574da4a1e5e016
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agoatv_demod: modify atv audio state disable when search [1/1]
nengwen.chen [Tue, 7 Aug 2018 07:34:20 +0000 (15:34 +0800)]
atv_demod: modify atv audio state disable when search [1/1]

PD#171279: modify atv audio state disable when search

Change-Id: I15c3fddb77bfe1125dafd1f63f8a74ff141bf1df
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agodtv_demod: txl: fix dvbc can't lock
Jihong Sui [Fri, 10 Aug 2018 01:48:27 +0000 (09:48 +0800)]
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>
6 years agohdmirx: set rxsense sync with hpd for every port
Hang Cheng [Mon, 6 Aug 2018 12:06:08 +0000 (20:06 +0800)]
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>
6 years agohdmitx: add dynamic hdr info to vpp
Yi Zhou [Wed, 8 Aug 2018 08:45:26 +0000 (16:45 +0800)]
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>
6 years agolcd: mipi-dsi: optimize mipi read function for video mode
Evoke Zhang [Tue, 7 Aug 2018 11:13:39 +0000 (19:13 +0800)]
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>
6 years agodefconfig: remove WQ_WATCHDOG amd DETECT_HUNG_TASK
Jianxin [Fri, 10 Aug 2018 10:59:46 +0000 (18:59 +0800)]
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>
6 years agoscritp: update merge check pl
Jianxin [Fri, 10 Aug 2018 10:54:11 +0000 (18:54 +0800)]
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>
6 years agoboard: add CONFIG_ARM64_A32 and CONFIG_COMPAT
Ao Xu [Wed, 1 Aug 2018 11:56:37 +0000 (19:56 +0800)]
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>
6 years agodts: Rename the dts name for u220.[2/2]
Tong Li [Mon, 13 Aug 2018 02:26:52 +0000 (10:26 +0800)]
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>
6 years agoaudio:fix dtv no sound output issue[3/3]
live.li [Mon, 23 Jul 2018 01:33:48 +0000 (09:33 +0800)]
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>
6 years agoosd: wait for vsync no need lock [1/1]
shuze.ma [Thu, 19 Jul 2018 13:59:30 +0000 (21:59 +0800)]
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>
6 years agoosd: fixed compile error on buildroot
Jiyu Yang [Fri, 10 Aug 2018 03:56:03 +0000 (11:56 +0800)]
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>
6 years agodvb: add configuration items to control dvb module compilation. [1\2]
Chuanzhi Wang [Thu, 26 Jul 2018 05:49:49 +0000 (13:49 +0800)]
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>
6 years agocec: otp: support one touch play and enter source
Yong Qin [Wed, 8 Aug 2018 07:23:00 +0000 (15:23 +0800)]
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>
6 years agocec: cec: auto power down function fail
Yong Qin [Wed, 8 Aug 2018 11:27:05 +0000 (19:27 +0800)]
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>
6 years agoemmc: upgrade gpt or ept based on priority
Ruixuan Li [Thu, 14 Jun 2018 12:21:50 +0000 (20:21 +0800)]
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>
6 years agodi: add mif enable after reset for g12
frank zhao [Wed, 8 Aug 2018 13:43:28 +0000 (09:43 -0400)]
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>
6 years agoosd: adjust render kthreads priority [1/1]
Jiyu Yang [Tue, 31 Jul 2018 03:34:43 +0000 (11:34 +0800)]
osd: adjust render kthreads priority [1/1]

PD#170791: by default, it is SCHED_NORMAL.

https://android.googlesource.com/kernel/msm/+/1a7a93bd33f48a369de29f6f2b56251127bf6ab4%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>
6 years agoboard: use do_div for divid operation
Ao Xu [Thu, 2 Aug 2018 06:48:41 +0000 (14:48 +0800)]
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>
6 years agobacklight: add step power on support
Evoke Zhang [Thu, 2 Aug 2018 09:03:18 +0000 (17:03 +0800)]
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>
6 years agoatv_demod: add xtal config for tuner [1/3]
nengwen.chen [Mon, 6 Aug 2018 11:04:10 +0000 (19:04 +0800)]
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>
6 years agoext4: fix check to prevent initializing reserved inodes
Theodore Ts'o [Sat, 28 Jul 2018 12:12:04 +0000 (08:12 -0400)]
ext4: fix check to prevent initializing reserved inodes

Commit 8844618d8aa7: "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: 8844618d8aa7 ("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>
6 years agoboard: fix ioremap call fail issue
Ao Xu [Thu, 2 Aug 2018 07:42:02 +0000 (15:42 +0800)]
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>
6 years agoboard: fix stack overflow issue
Ao Xu [Wed, 1 Aug 2018 11:30:04 +0000 (19:30 +0800)]
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>
6 years agowifi: fix broadcom pcie wifi driver use static buf failed
libo [Wed, 8 Aug 2018 04:51:48 +0000 (12:51 +0800)]
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>
6 years agodvb-core: recover dvb-core support dtmb in dvb v3 [1/1]
nengwen.chen [Wed, 8 Aug 2018 07:10:48 +0000 (15:10 +0800)]
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>
6 years agocec: add port info for mix mode
Yong Qin [Fri, 3 Aug 2018 01:02:00 +0000 (09:02 +0800)]
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>
6 years agohdmitx: hdmitx: add debug info
Kaifu Hu [Fri, 3 Aug 2018 07:55:47 +0000 (15:55 +0800)]
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>
6 years agoBACKPORT:dma-buf/fence: Fix lock inversion within dma-fence-array
Chris Wilson [Tue, 14 Nov 2017 16:27:19 +0000 (16:27 +0000)]
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

6 years agoBACKPORT: dma-buf/sync_file: Allow multiple sync_files to wrap a single dma-fence
Chris Wilson [Fri, 28 Jul 2017 21:29:51 +0000 (22:29 +0100)]
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 e24165537312
("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: f1e8c67123cf ("dma-buf/sw-sync: Use an rbtree to sort fences in the timeline")
Fixes: e9083420bbac ("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>
6 years agovideo: support hdr new interface [3/4]
Yao.Liu [Fri, 13 Jul 2018 11:07:34 +0000 (19:07 +0800)]
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>
6 years agodts: update the gpio key node for atom and sei210
Yingyuan Zhu [Tue, 7 Aug 2018 06:07:39 +0000 (14:07 +0800)]
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>
6 years agoRevert "BACKPORT: dma-buf/sync_file: Allow multiple sync_files to wrap a single dma...
Victor Wan [Tue, 7 Aug 2018 06:45:33 +0000 (14:45 +0800)]
Revert "BACKPORT: dma-buf/sync_file: Allow multiple sync_files to wrap a single dma-fence"

This reverts commit 74fa0af47306baf118b32b7acdba4ae98eda7a7d.

The commit 74fa0af caused GPU driver loading failed.

Change-Id: I255eb6b7a26e3b00e4f11489ece49896ff004d79

6 years agoMerge branch 'android-4.9' into amlogic-4.9-dev
Victor Wan [Tue, 7 Aug 2018 06:43:24 +0000 (14:43 +0800)]
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

6 years agodts: add dtsi for system as root [1/9]
Xindong Xu [Mon, 9 Jul 2018 05:49:38 +0000 (13:49 +0800)]
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>
6 years agomtd: spifc: add spifc support for txl
Yi Zeng [Thu, 2 Aug 2018 06:22:04 +0000 (14:22 +0800)]
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>
6 years agoamvecm: dnlp coverity fix
MingLiang Dong [Mon, 6 Aug 2018 03:30:52 +0000 (11:30 +0800)]
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>
6 years agodts:txlx_t962x_r311_720p: fix commit error[1/1]
Lei Qian [Mon, 6 Aug 2018 13:35:20 +0000 (21:35 +0800)]
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>