Commit Graph

647996 Commits

Author SHA1 Message Date
keke.li
09b8979dfd gdc: support Y_grey/YUV444p/RGB444P format image
PD#173042: gdc: support Y_grey/YUV444p/RGB444P format image

Change-Id: I5b6928bfb4000d58d2bbd05bf8b1121b83ec2c0a
Signed-off-by: Keke Li <keke.li@amlogic.com>
2018-09-18 04:02:14 -07:00
yicheng shen
6fbde97524 hdmirx: add hdcp22-not-support handle[2/2]
PD#173334: hdmirx: add hdcp22-not-support handle

if systemcontrol cant access the aic tool,inform driver
that hdcp2.2 is not support via ioctl

Change-Id: I2d9541a497842e027e898f5fa3a23c51583c8181
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
2018-09-18 03:51:59 -07:00
Long Yu
0219a5c3ac sdio: After the TXLX IC is changed to use the fixed adj way to tuning
PD#171973: sdio: After the TXLX IC is changed to use the fixed adj way to tuning

Change-Id: I986812841d0ef86bb801f3fd4d37d6f2f38fce05
Signed-off-by: Long Yu <long.yu@amlogic.com>
2018-09-18 03:38:40 -07:00
MingLiang Dong
f6ec78b7a0 hdr: fix sdr2hdr effect expose
PD#172383: hdr: fix sdr2hdr effect expose

1. change sdr2hdr ootf lut
2. disable cgain when sdr2hdr

Change-Id: I308c0d8071b932164363603cc6af81c6343b4ec0
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-09-18 03:36:59 -07:00
nengwen.chen
a2bd42c980 atv_demod: added protection when standby wakes up [1/1]
PD#173542: added protection when standby wakes up

1.added protection when standby wakes up.
2.separate the register access, afc and monitor into a separate module.
3.optimize the code.
4.remove unused code.

Change-Id: Ib81ebb5a175d8e7c8934151fb3dd3033a29ae0f7
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2018-09-18 03:36:42 -07:00
Dezhi Kong
86e7fa6f07 vlock: add adj stable check
PD#170985: vlock: add pll adj stable check

1.add pll adj stable check avoid pll m adj
2.add vlock version info
3.add enc adj stable check avoid enc line adj repeate
4.add enc_max_line_switch default config
5.update pll default regmap setting
6.add pll adj value check avoid blink caused by big pll step adj
7.optimize enc pixel adj method
8.add support dts config vlock key parameters
9.move vlock process to start of vsync isr
10.optimize pll for txl vbyone

Change-Id: Ie6e0aaacd23bfd7178db48e6f0d7bbec426b271f
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
2018-09-18 02:21:22 -07:00
Hong Guo
c3f9c8c85e arm64: dts: g12a/g12b: update cpufreq max to 1.8G.
PD#165143: cpufreq: update cpufreq max to 1.8G.

Change-Id: I8a1cc45a7586ac4342fd459987fc7f4c89471be2
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2018-09-18 00:51:35 -07:00
Jianxiong Pan
0702280150 dts: specify ion_reserved to allocate memory from low memory
PD#173802: dts: ion_reserved address mapping problem in 32bit kernel4.9

Change-Id: I3bb23c435ecf4da59985782f6f54564ed76e121a
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2018-09-18 00:47:37 -07:00
Jianxin Pan
fd9dacf2d1 dts: arch32: sync dtb between aarch64 and aarch32
PD#173683: remove unnecessary difference between aarch32 and aarch64

Change-Id: I9a1248e3d38dadf9cc6c4bb5e0a6f8c5dbd24a0a
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2018-09-17 03:52:30 -07:00
Peng Yixin
a98b098845 media: fix some coverity error.
PD#170543: media: fix some coverity error.

fix some coverity error

Change-Id: I09924231704c2752d86e52290b97e1e178379feb
Signed-off-by: Peng Yixin <yixin.peng@amlogic.com>
2018-09-17 03:20:01 -07:00
Nian Jing
c4e78ab612 vdac: add shutdown function
PD#173443: add shutdown function
	disable cvbsout driver config

Change-Id: I2c9a5e908b0c66e79bb200bebf0bf4fc312e77ef
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-09-17 02:25:08 -07:00
MingLiang Dong
b1842bec43 hdr: optimize hdrv2 hdr2sdr effect
PD#171788: hdr: optimize hdrv2 hdr2sdr effect

1. oetf blend with oogain
2. set oagin with max(RGB)
3. fix sdr2hlg osd too dark

Change-Id: Ib40de7dfa5727cec62573c43dfa38a931b177aed
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-09-17 02:24:26 -07:00
he.he
f61cd61214 usb: USB 2.0 EHHSEL for USB-IF Compliance Test
PD#173077

EHHSEL: Embedded Host High Speed Electrical Test.
The purpose of this commit is to send EHHSEL command in message.c .

Change-Id: I800deed43efba99398dcf22802383817931d1735
Signed-off-by: he.he <he.he@amlogic.com>
2018-09-17 01:32:01 -07:00
Hanjie Lin
47a87b6930 kmemleak: shouldn't scan reserved memory
PD#170481: kmemleak: shouldn't scan reserved memory

set reserved memory to no scan

Change-Id: I39fce2ca8d4dc6525f3fbc15622a4b5bcbc5344b
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2018-09-16 22:33:46 -07:00
Ruixuan Li
b5f37f3758 emmc: solve code coverity problem
PD#173510 solve code coverity problem

Change-Id: Id4e661162c7fb5f975ffc4c0358e175b1c912c4b
Signed-off-by: Ruixuan Li <ruixuan.li@amlogic.com>
2018-09-16 19:54:20 -07:00
Hong Guo
1f216d03f2 CPUFREQ: Release cpu opp table when entry suspend.[1/2]
PD#165143: Release cpu opp table when entry suspend.

Change-Id: Iee5100385a4bd5fd871b38226668c1a24bf6755e
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2018-09-14 09:12:12 -07:00
yujie.wu
c45bca5d42 audio: Add supporting of DTS HD for HDMI input[2/2]
PD#172835

Add dynamic PAO mode for HDMI input

Change-Id: I91849eaef1b225fb8734ea128a092e1c2fece6b3
Signed-off-by: yujie.wu <yujie.wu@amlogic.com>
2018-09-14 09:09:59 -07:00
xianjun.liu
fcfd9cc47f mtd: fix recoverity isuue
PD#172180: fix coverity issue for mtd

Change-Id: I00725b398edbee55863868c53ed901fb80607bd1
Signed-off-by: xianjun.liu <xianjun.liu@amlogic.com>
2018-09-14 09:04:11 -07:00
pengcheng chen
b415469b29 OSD: viu2 cvbs display half UI
PD#169796: OSD: viu2 cvbs display half UI

Change-Id: I9d8cf88f7913d75fcfe7bd9428bd88e033087b55
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-09-14 05:08:53 -07:00
pengcheng chen
09a6a4bc18 osd: add fb3 viu2 support for direct render
PD#169796: osd: add fb3 viu2 support for direct render

Change-Id: Ic3492a5f0c26d5d517791c79c4579109f7258682
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-09-14 05:08:18 -07:00
jiamin ma
96e7519870 debug: show more debug info when hardlockup happens
PD#173193: need more debug info when hardlockup happens

Change-Id: Ia265a58ba776168ac4838cc7f4a6d7cfbeaf6557
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
2018-09-14 04:59:21 -07:00
Jianxin Pan
a799d5187f 32bit: add P321 support for aarch32
PD#173683: add P321

Change-Id: I46228d22a244e7c43b75f2a6f784c13ac413b57f
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2018-09-14 00:45:16 -07:00
zhiqiang.liang
6734841f95 dts: add the suspend which match ATF1.0
PD#173525: can't enter the suspend state

Change-Id: I10a21687e7fb9fb7f71de339c0b03175ee9a90ad
Signed-off-by: zhiqiang.liang <zhiqiang.liang@amlogic.com>
2018-09-14 00:40:58 -07:00
Yue Wang
cb128a95da usb: usb: optimize g12a & g12b usb phy pll setting [2/2]
PD#173329

Problem:
optimize g12a & g12b usb phy pll setting.

Solution:
optimize g12a & g12b usb phy pll setting.

Verify:
s905d2 u200

Change-Id: I53f437e35ac9cf204e00a5b624f7728937042e70
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2018-09-13 18:33:44 +08:00
Yue Wang
69e93ab7f6 usb: optimize g12a & g12b usb phy reset timing.
PD#173329: usb: optimize g12a & g12b usb phy reset timing.

Change-Id: Ib1ffe45d418a6ec023d19e888c54d60cac226473
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2018-09-12 03:27:55 -07:00
Nian Jing
eba5f69109 tvafe: optimiz 400ms for paln identification
PD#172974: optimization for paln identification

Change-Id: I8e1e130c79e5d77ce7038cced09eda86be4ca753
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-09-12 03:27:32 -07:00
pengcheng chen
cccccd7680 osd: add osd blend shift workaround
PD#163001: osd: add osd blend shift workaround(default disable)

Change-Id: Ic488f9414a35f5a8e2ba7ec789c2061fe526e804
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-09-12 03:10:25 -07:00
Yue Wang
d65d69a6ad usb: optimize g12a & g12b usb phy pll setting.
PD#173475: usb: optimize g12a & g12b usb phy pll setting.

Change-Id: Iaf2058849d9a112fbcc0e99cab38a65cf6efbd9a
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2018-09-11 23:05:50 -07:00
Yue Wang
1fef1fae05 kasan: fix bug report in xhci driver
PD#172700

KASAN found a use-after-free in xhci_free_virt_device+0x220/0x270
where xhci_free_virt_device() sets slot id to 0 if udev exists:
if (dev->udev && dev->udev->slot_id)
	dev->udev->slot_id = 0;

dev->udev will be true even if udev is freed because dev->udev is
not set to NULL.

set dev->udev pointer to NULL in xhci_free_dev()

The original patch went to stable so this fix needs to be applied
there as well.

Change-Id: I552b245ac7a047d8190a59bd18876cd650f289a1
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2018-09-11 22:47:14 -07:00
pengcheng chen
c0a7f4010b osd: fix osd buildroot compile error
PD#163001: osd: fix osd buildroot compile error

Change-Id: I93b9b9646316879f013f901f683c092a20d9ff71
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-09-11 18:55:40 -07:00
shuanglong.wang
2c51125815 video: toggle first frame for netflix video peek
PD#172137 :toggle first frame for netflix video peek

Change-Id: I28b29cba40f621c71fd67f0cf0c8e80c835483cf
Signed-off-by: shuanglong.wang <shuanglong.wang@amlogic.com>
2018-09-11 07:41:26 -07:00
Peng Yixin
b7a3f4eb7e codec_mm: fix serial port prints "memory allocate failure" message.
PD#172077

Change-Id: Id89a4b3e26ae928a3be0f098592ce42cdaead49b
Signed-off-by: Peng Yixin <yixin.peng@amlogic.com>
2018-09-11 07:41:00 -07:00
keke.li
c5e8a587e1 gdc: modify the line offset of gdc
PD#173042: gdc: modify the line offset param of gdc

Change-Id: I946f174282fe6583432c408065a56f685db424d2
Signed-off-by: Keke Li <keke.li@amlogic.com>
2018-09-11 01:07:45 -07:00
Evoke Zhang
a23b13edc8 lcd: g12b: update hpll & gp0_pll wait lock sequence [2/2]
PD#172762: lcd: g12b: update hpll & gp0_pll wait lock sequence

Change-Id: If085975292682ed5570e2fc326c895d38e896449
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-09-11 01:07:16 -07:00
Evoke Zhang
68a3a034e2 lcd: mipi-dsi: optimize power on sequence for encl and dsi [2/2]
PD#170290: lcd: mipi-dsi: optimize power on sequence for encl and dsi

Change-Id: If081780fe22d2a94548ff7afe8dfdb099d6b725a
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-09-11 01:01:39 -07:00
Evoke Zhang
e4386a05af lcd: add viu2 vsync interrupt & no viu vsync supoort
PD#172761: lcd: add viu2 vsync interrupt & no viu vsync supoort

Change-Id: Idefc6208af4cfe650907e97fd823353405fce35d
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-09-11 01:01:03 -07:00
pengcheng chen
23bf6ab61f osd: screen zoom in/out support for mesonhwc
PD#163001: osd: screen zoom in/out support for mesonhwc
1. support screen zoom in/out
2. support 1080i
3. support afbcd RGBA_1010102
4. fix fence error for mesonhwc caused by commit 76382d549b
   ("osd: adjust render kthreads priority [1/1]")
5. fix cursor distort on top of the screen

Change-Id: I99e2593fd5eb5263da689321a84fbabd2527cf03
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-09-10 23:33:11 -07:00
Long Yu
370db27ea7 emmc: aign all data lines with latest data for HS200 busmode
PD#170721: align all data lines with latest data for HS200 busmode

Change-Id: I94b07e6ae2e16a5dfd0c0dfafd4c9d45fe0b6d11
Signed-off-by: Long Yu <long.yu@amlogic.com>
2018-09-10 23:00:50 -07:00
Evoke Zhang
d230fcaff2 lcd: mipi-dsi: update phy timing calculation [2/2]
PD#169192: lcd: mipi-dsi: update phy timing calculation

Change-Id: I0ed035d3f1852da98abbea940e72b2fac396f858
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-09-10 22:45:20 -07:00
Rico Yang
8bd457c1b1 ionvideo: support yuv422 frame from di
PD#160993: ionvideo: support yuv422 frame from di

support yuv422 frame from di in ionvideo to enable deinterlacing on OSD

Change-Id: Ibc9a1e3021f06d0f9c3f21ac3e6359c0fd465b7c
Signed-off-by: Rico Yang <wei.yang@amlogic.com>
2018-09-10 07:49:42 -07:00
Nian Jing
d306aa5593 vdac: add Bandgap optimization
PD#171856: optimizationg bandgap for hdmi audio pll unlock

Change-Id: Iaa042ab0589ed85e812cdb18b6f4aa9fc7a0e85a
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-09-10 07:47:35 -07:00
Rong Zhang
50bbcd9052 MH264: Support 4K MMU visition for G12A
PD#169065: Support 4K MMU visition

Change-Id: I8c93159aaf2079ec52be94f37226c3c50e3edbaa
Signed-off-by: Rong Zhang <rong.zhang@amlogic.com>
2018-09-10 06:55:49 -07:00
yicheng shen
c233917f28 hdmirx: reset bandgap when aud pll error
PD#171856: hdmirx: reset bandgap when aud pll error

Change-Id: I17970eeeea89726513dee61ea743769753a5e71a
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
2018-09-10 06:53:49 -07:00
Dezhi Kong
a468c0df66 amvecm: add cm enable/disable flag
PD#170727: amvecm: add cm enable/disable flag

Change-Id: Id56777a45c056216eb1c893fe7d8c7f4cabedfc0
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
2018-09-10 06:52:30 -07:00
Lei Qian
0ac65c78e3 dts: r311: reduce ion memory allocation [2/2]
PD#173394:dts: r311: reduce ion memory allocation

Change-Id: Ie8facd2079f9095e695f5c0047705741152bea37
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
2018-09-10 06:51:25 -07:00
Tao Zeng
aed326664a Merge "hdmirx: fix kasan bug in rx_get_edid" into amlogic-4.9-dev 2018-09-10 05:05:56 -07:00
Hang Cheng
ad6584e66e hdmirx: fix kasan bug in rx_get_edid
PD#172927: hdmirx: fix KASAN bug in rx_get_edid

BUG: KASAN: global-out-of-bounds in rx_get_edid+0x74/0xa0
Read of size 8 at addr ffffff900bda5cb8 by task swapper/0/1

CPU: 3 PID: 1 Comm: swapper/0 Not tainted 4.9.113 #3
Hardware name: Amlogic (DT)
Call trace:
[<ffffff900908ecc0>] dump_backtrace+0x0/0x368
[<ffffff900908f0cc>] show_stack+0x24/0x30
[<ffffff900963bdb0>] dump_stack+0xa0/0xc8
[<ffffff90092ba21c>] print_address_description+0x144/0x258
[<ffffff90092ba694>] kasan_report+0x264/0x338
[<ffffff90092b8cd4>] __asan_load8+0x84/0x98
[<ffffff9009cdd394>] rx_get_edid+0x74/0xa0
[<ffffff9009cde2ec>] hdmi_rx_top_edid_update+0xb4/0x1d8
[<ffffff9009ccf524>] hdmirx_hw_probe+0x10c/0x168
[<ffffff9009cd3eb0>] hdmirx_probe+0x9d8/0x10f8
[<ffffff9009762b60>] platform_drv_probe+0x78/0xf8
[<ffffff900975f93c>] driver_probe_device+0x134/0x380
[<ffffff900975fc74>] __driver_attach+0xec/0xf0
[<ffffff900975c71c>] bus_for_each_dev+0xf4/0x160
[<ffffff900975eec8>] driver_attach+0x38/0x48
[<ffffff900975e748>] bus_add_driver+0x1b0/0x308
[<ffffff9009760d34>] driver_register+0xbc/0x1a0
[<ffffff9009762a4c>] __platform_driver_register+0x84/0x90
[<ffffff900ac1752c>] hdmirx_init+0xa0/0xfc
[<ffffff900908421c>] do_one_initcall+0xac/0x1f8
[<ffffff900abc10bc>] kernel_init_freeable+0x254/0x2f4
[<ffffff900a2929b0>] kernel_init+0x18/0x118
[<ffffff9009083e80>] ret_from_fork+0x10/0x50

The buggy address belongs to the variable:
 edid_list+0x38/0x60

Memory state around the buggy address:
 ffffff900bda5b80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 ffffff900bda5c00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
>ffffff900bda5c80: 00 00 00 00 00 00 fa fa fa fa fa fa 04 fa fa fa
                                        ^
 ffffff900bda5d00: fa fa fa fa 01 fa fa fa fa fa fa fa 00 00 00 00
 ffffff900bda5d80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
==================================================================

Change-Id: Ie0bdc00195732b4bc6f317c33dcc34ace3dc4051
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
2018-09-10 11:44:35 +08:00
Yu Tu
ce60ab4bd6 irblaster: code optimization for axg g12a and g12b
PD#172603: irblaster: code optimization

Add interrupt for irblaster. Because it adds a way to
interrupt starting with axg. Check out AO_IR_BLASTER_ADDR3
for details.

Change-Id: I24761207d43c1d783a4669b352f2f93e994df357
Signed-off-by: Yu Tu <yu.tu@amlogic.com>
2018-09-07 17:55:33 +08:00
Brian Zhu
7c7d0fe3e5 osd: fix using the fence_map which may be freed by KASAN scan
PD#172928: osd: fix using the fence_map which may be freed by KASAN scan
    KASAN log:
        BUG: KASAN: use-after-free in sync_render_single_fence+0x25c/0x3b0
        Read of size 4 at addr ffffffc017f49864 by task HwBinder:3104_2/3182

Change-Id: Ia3e9987da9218eeba07e44178d62f55555707979
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2018-09-07 01:55:49 -07:00
Brian Zhu
e01b7f9040 osd: fix access disp_rect memory out-of-bounds by KASAN scan
PD#172933: osd: fix access disp_rect memory out-of-bounds by KASAN scan
    KASAN log:
        BUG: KASAN: global-out-of-bounds in osd_notify_callback+0x1e8/0x5f0
        Read of size 4 at addr ffffff900c8e91a0 by task HwBinder:3063_2/3163

Change-Id: Icbea6a91da73919a09d37295660fb029e1de8488
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2018-09-07 01:55:22 -07:00