Commit Graph

653669 Commits

Author SHA1 Message Date
bing.jiang
16bcc9b900 dts: Add new dts files for S400 SBR [1/3]
PD#SWPL-4435

Problem:
    adapt Soundbar solution to S400 SBR platform

Solution:
    new dts file axg_s400_v03sbr.dts changed from axg_s400_v03.dts
    add reference remote control mapping in mesonaxg.dtsi
    add tas5782m

Verify:
    S400+D621 A113D

Change-Id: I6feee3993192656eb66b7ee5a9ff6c85d22075e4
Signed-off-by: bing.jiang <bing.jiang@amlogic.com>
Signed-off-by: yujie.wu <yujie.wu@amlogic.com>

Conflicts:
	MAINTAINERS
	sound/soc/codecs/amlogic/tas5782m.c
2019-07-23 17:52:49 +09:00
Nian Jing
b0848aa3b8 vbi: use dma alloc instead reserved memory [1/1]
PD#SWPL-4510

Problem:
do not use reserved memory

Solution:
use dma_alloc_coherent instead reserved memory

Verify:
x301

Change-Id: I6498772809c8f1f48a7d4dd24aa18433eff3e618
Signed-off-by: Nian Jing <nian.jing@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
	arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts
2019-07-23 17:52:49 +09:00
changqing.gao
8df003b1c1 mm: The first 1MB mem is wasted for CPU series coming after TXLX [1/1]
PD#SWPL-3744

Problem:
For the previous Amlogic CPU series(before TXLX), the CPU booting vector
locates at physical address starting from 0x00. To avoid influencing cpu
booting procedure, we have to reserve the first 1MB physical memory. But
it has changed since TXLX, the normal text section can safely use 0~1M
physical address. So it's no need to reserve the first 1MB in DTS.

Solution:
Change the starting address of usable memory from 0x100000 to 0x0 for CPU
series coming after TXLX.

Verify:
Locally on W400

Change-Id: I2df7859a38feca48abd58459e8b231ee15ada9e2
Signed-off-by: changqing.gao <changqing.gao@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts
2019-07-23 17:52:49 +09:00
Jianxiong Pan
a46317b63e dts: g12b: copy g12b dts [1/1]
PD#SWPL-5020

Problem:
copy g12b dts.

Solution:
copy.

Verify:
local.

Change-Id: Ibd6423bd0cc99e98bf1d6359068f9f0719ad177f
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
Signed-off-by: Hong Guo <hong.guo@amlogic.com>

Conflicts:
	MAINTAINERS
	arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts
	arch/arm/boot/dts/amlogic/g12b_pxp.dts
	arch/arm/boot/dts/amlogic/g12b_pxp_a.dts
	arch/arm/boot/dts/amlogic/mesong12b_a.dtsi
	arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts
	arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts
	arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts
	arch/arm64/boot/dts/amlogic/g12b_pxp.dts
	arch/arm64/boot/dts/amlogic/g12b_pxp_a.dts
	arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi
2019-07-23 17:52:49 +09:00
Bichao Zheng
641b2bb082 arm: dts: update vddcpu pwm regulator voltage-table [1/1]
PD#SWPL-4225

Problem:
TL1 hardware update DCDC of vddcpu

Solution:
update vddcpu voltage-table
[old]
voltage range: 1021mv - 721mv  step size: 10mv step: 30

[new]
voltage range: 1049mv - 689mv  step size: 10mv step: 36

Verify:
test pass on tl1_X301_v1 tl1_skt_v1

Change-Id: I3adea525940737490197566a8c85b5b00c375ed0
Signed-off-by: Bichao Zheng <bichao.zheng@amlogic.com>

Conflicts:
	arch/arm64/boot/dts/amlogic/mesontm2.dtsi
	arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
	arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
2019-07-23 17:52:49 +09:00
Nan Li
cc50262270 sd: add sduart not supported flag [1/1]
PD#SWPL-4858

Problem:
tl1 not support sduart

Solution:
add not supported flag in match_data

Verify:
verify by tl1 skt

Change-Id: I651765433bb62892fad770c85a5eccd4805e7c79
Signed-off-by: Nan Li <nan.li@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/tl1_pxp.dts
	arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
	drivers/amlogic/mmc/amlsd.c
2019-07-23 17:52:49 +09:00
jintao xu
ef27279214 omx: add two layer support [3/6]
PD#SWPL-85

Problem:
Need support two video layers feature

Solution:
1: Add videosync.
2: amlvideo support multi-instance

Verify:
U212

Change-Id: I3570fad361ba5bd388dd46c51a66da056fa7a1fd
Signed-off-by: jintao xu <jintao.xu@amlogic.com>

Conflicts:
	MAINTAINERS
	drivers/amlogic/media/video_processor/videosync/videosync.c
2019-07-23 17:52:49 +09:00
Yingyuan Zhu
50d14a7d11 jtag: meson: fix jtag pinmux settings issue [2/2]
PD#SWPL-4501

Problem:
Standard pinmux APIs were not used

Solution:
Setting pinmux instead of require for gpio

Verify:
tl1,g12a,g12b,axg,txl,txlx,gxl

Change-Id: I0ad88f414832686d795d252f70e81a34f6cb0f9e
Signed-off-by: Yingyuan Zhu <yingyuan.zhu@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/mesontxl.dtsi
	arch/arm64/boot/dts/amlogic/mesontxl.dtsi
2019-07-23 17:52:49 +09:00
Hong Guo
223ae73582 cpufreq: add more syspll freq info [1/1]
PD#SWPL-4035

Problem:
add more syspll freq info.

Solution:
add more syspll freq info.

Verify:
g12a_u200, verify pass

Change-Id: I3e2a587f5ebaa20126e6ad5c37bd9d2730a75125
Signed-off-by: Hong Guo <hong.guo@amlogic.com>

Conflicts:
	drivers/amlogic/clk/g12a/g12a.h
2019-07-23 17:52:49 +09:00
Shuai Li
307bf38e2d audio: enable hw resmaple pause thd [1/1]
PD#TV-4638

Problem:
Speaker output high frequency howling
after change from pattern 615 to pattern 1 on chroma22294.
The hw resampler keeps sending noise if it has no input.

Solution:
Enable the hw resample pause thd by default.

Verify:
TL1 X301.

Change-Id: Ib6f0924025e155eaa8ba0e3681b307f7ff56b449
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2019-07-23 17:52:49 +09:00
Jianxin Pan
9146c68924 Revert "audio: enable hw resmaple pause thd [1/1]"
This reverts commit 8398f8a917.

Change-Id: I76a3c8fc66b528b62e57630603ad3887b0b3abdc
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2019-07-23 17:52:49 +09:00
Shuai Li
f660ba05d3 audio: enable hw resmaple pause thd [1/1]
PD#TV-4638

Problem:
Speaker output high frequency howling
after change from pattern 615 to pattern 1 on chroma22294.
The hw resampler keeps sending noise if it has no input.

Solution:
Enable the hw resample pause thd by default.

Verify:
TL1 X301.

Change-Id: I076d1b80c6482661fdc3fd5808f1cc231666d07e
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2019-07-23 17:52:49 +09:00
Zhe Wang
4ccf3d2f04 audio: fixed kernel panic when resample is disabled [1/1]
PD#SWPL-7039

Problem:
Kernel Panic when resample A is disabled

Solution:
When resample is disabled,don't init resample

Verify:
Verified on T962e2_ab311

Change-Id: Id9552ffc6be40f133b828dbded4ad3f15d177ab0
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
2019-07-23 17:52:49 +09:00
Shuai Li
80a53edf24 audio: always on DDR arb [1/1]
PD#TV-3452

Problem:
Toddr stuck after a long time playback.

Solution:
For debug usage.

Verify:
No need.

Change-Id: Ibf4446148f5e028040d7d6527c7695f23f964f7c
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
2019-07-23 17:52:49 +09:00
Shuai Li
46dd166a01 audio: add HW resample for HDMIRX [1/1]
PD#SWPL-6118

Problem:
No resample will cause mismatch between
input and output if they are not at same
samplerate.

Solution:
Add resample for hdmirx case

Verify:
Local tested.

Change-Id: I298e401578bf49484d6b75fd736d2a74c38508e4
Signed-off-by: Shuai Li <shuai.li@amlogic.com>

Conflicts:
	sound/soc/amlogic/auge/ddr_mngr.c
	sound/soc/amlogic/auge/ddr_mngr.h
2019-07-23 17:52:49 +09:00
Zhe Wang
b93b3cdfb8 audio: add tdm and spdif clk fine tuning interface [1/1]
PD#SWPL-5518

Problem:
In DTV passthrough, the output clk drifts from input

Solution:
add clk fine tuning interface

Verify:
verify by X301

Change-Id: I969d3eb865fb1aba90f155965548454cc3040c99
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>

Conflicts:
	sound/soc/amlogic/auge/tdm.c
2019-07-23 17:52:49 +09:00
Xing Wang
8aa35da1e3 audio: auge: transfer audio data to wake word algorithm [1/3]
PD#TV-3389

Problem:
add vad wake engine in kernel

Solution:
transfer audio data to wake engine

Verify:
x301

Change-Id: I7f44d0141141775bb40f01dbc344a295a72c9d87
Signed-off-by: Xing Wang <xing.wang@amlogic.com>

Conflicts:
	MAINTAINERS
2019-07-23 17:52:49 +09:00
Zhe Wang
35d1d8035a audio: add soc DRC tune interface [1/3]
PD#SWPL-5904

Problem:
Audio DRC in SOC is out of work

Solution:
Add DRC tune interface

Verify:
Verify on X301

Change-Id: I5e8ecc6dafd7fc3805b0c3e60a6ec4c945729119
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
2019-07-23 17:52:49 +09:00
Gongwei Chen
a246df3d2e dts: g12a and g12b no audio output [1/1]
PD#SWPL-6171

Problem:
no audio output

Solution:
modify dts spdifout_a_mute

Verify:
Verify by Android P AOSP fermi

Change-Id: Ie19d22326154b8f59ce06dce994f8dd072e93170
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
Shuai Li
8ec1d0bb4e faudio: add I2S samesrc channel mapping to spdif [1/1]
PD#SWPL-6147

Problem:
I2S has 8 channels but spdif only 2.
Need map every single i2s lane to spdif sharebuffer.

Solution:
Add the DTS setting MASKS as former does.

Verify:
Local tested.

Change-Id: If212fc1b9c937a42778682948773874951b8a55a
Signed-off-by: Shuai Li <shuai.li@amlogic.com>

Conflicts:
	sound/soc/amlogic/auge/tdm.c
2019-07-23 17:52:49 +09:00
yujie.wu
4b06ab36f0 audio: Add Mute function for tas5782 [1/1]
PD#SWPL-5961

Problem:
  There is no mute control for tas5782

Solution:
  Add mute function for tas 5782

Verify:
  A113

Change-Id: I75f8b82a359778f28494636fe76c7bc4db848643
Signed-off-by: yujie.wu <yujie.wu@amlogic.com>
2019-07-23 17:52:49 +09:00
Shuai Li
7a0ca0a364 audio: pull down audio I2S pins [1/1]
PD#TV-2362

Problem:
A DC voltage is always there about 300ms.
And coupled with LRCLK and SCLK which
may cause a toggle an DAC side.

Solution:
Pull down the data pin to clear
the DC level.

Verify:
Local verified.

Change-Id: Ib7aff22c44dcec2f653b7ed29495e5e52c16e038
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2019-07-23 17:52:49 +09:00
Shuai Li
856ad33f9c audio: add spdif/HDMI mute ctrl [1/1]
PD#TV-3016

Problem:
HDMI SPDIF mute interface has no effect.

Solution:
Add these interfaces for auge platform.

Verify:
Tested locally.

Change-Id: I168c0940e0f2b3d94091d43c6b8190f6f833c0f1
Signed-off-by: Shuai Li <shuai.li@amlogic.com>

Conflicts:
	arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
	sound/soc/amlogic/auge/spdif.c
2019-07-23 17:52:49 +09:00
Shuai Li
26aa6d82a5 audio: fix H-voltage when tdm disable [1/1]
PD#SWPL-2952

Problem:
High voltage will cause the tdmout
data pin wrong I2S data which cause pop.

Solution:
Disable the bias of gpio.

Verify:
I2S data will be low when I2s closed.

Change-Id: If5d68e0f30df074f528dfec21cbe297795bc4ea7
Signed-off-by: Shuai Li <shuai.li@amlogic.com>

Conflicts:
	arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
	arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
	sound/soc/amlogic/auge/tdm.c
2019-07-23 17:52:49 +09:00
Zhe Wang
63966474c7 audio: tune audio volume slew time [1/1]
PD#SWPL-5845

Problem:
audio playback too slow

Solution:
change audio volume slew time

Verify:
Locally test on X301

Change-Id: I48c920037cac852aaa01818bb02eaa8991c1df6b
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
2019-07-23 17:52:49 +09:00
yujie.wu
b46f77e015 audio: Add tas5782 volume control [1/1]
PD#SWPL-4734

Problem:
  There is no volume control for tas5782

Solution:
  Add ch1/ch2 volume control for tas5782

Verify:
  A113

Change-Id: I1e866a2bc024713278aea0c19cc8c91084a24b90
Signed-off-by: yujie.wu <yujie.wu@amlogic.com>

Conflicts:
	sound/soc/codecs/amlogic/tas5782m.c
2019-07-23 17:52:49 +09:00
Zhe Wang
4932956e38 audio: add kcontrol of EQ setting [1/2]
PD#TV-1808,TV-1809,TV-1810,TV-1811

Problem:
HW EQ on TL1 doesn't work

Solution:
Add kcontrol of EQ setting and getting

Verify:
test on X301

Change-Id: Iea1525b4a57241a99389c746c0238d96424df316
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>

Conflicts:
	MAINTAINERS
2019-07-23 17:52:49 +09:00
Xing Wang
6acc0dda5e audio: auge: modify share buffer can be occupied by later module [1/2]
PD#SWPL-5300

Problem:
share buffer is not alaway used for tdm and spdif,
but raw data needs to output by spdif.
this would lead to spk silence for dual output

Solution:
share buffer can be occupied by later module.
when tdm and spdif output in share buffer, then play spdif,
spdif will release from share buffer,
only frddr is only used for tdm, another new frddr is used for spdif.

Verify:
x301

Change-Id: Ib0c2e02e575f496c0b0911d347857ede0d0cfa14
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2019-07-23 17:52:49 +09:00
Xing Wang
2f3e0e650a audio: auge: fix spdif reset when used for share buffer [1/1]
PD#SWPL-3655

Problem:
spdif output 8 channel, channel map in wrong order.

Solution:
reset spdif before enable as soon as quickly.
modification is limited for tl1 now

Verify:
x301

Change-Id: I224032390404be85c77d7436a9be9148df09c997
Signed-off-by: Xing Wang <xing.wang@amlogic.com>

Conflicts:
	sound/soc/amlogic/auge/tdm.c
2019-07-23 17:52:49 +09:00
Shuai Li
743550e67e audio: audio glitch at tdm startup [1/1]
PD#SWPL-5219

Problem:
audio glitch at tdm startup

Solution:
Pad 0 data to clear the remaining data
in the module.

Verify:
Local tested.

Change-Id: Iab526c6893a32030799567b57e05e7bb11b8fea0
Signed-off-by: Shuai Li <shuai.li@amlogic.com>

Conflicts:
	sound/soc/amlogic/auge/tdm.c
2019-07-23 17:52:49 +09:00
Xing Wang
6c32cf605b audio: auge: fix spdifout clk for share buffer [1/1]
PD#SWPL-4278

Problem:
spdif out clk is related to tdm clk for share buffer.
For play raw data 32k/44.1k, it's not correct for spdif out clk.

Solution:
separate spdif out clk and tdm clk

Verify:
x301

Change-Id: Ie6e3d7413d9577c9c80ea90e8b1f9ff4bf3eefcf
Signed-off-by: Xing Wang <xing.wang@amlogic.com>

Conflicts:
	sound/soc/amlogic/auge/spdif_hw.c
2019-07-23 17:52:49 +09:00
yujie.wu
cf2fbdeaa0 audio: Add HBR audio info for HDMI input [2/3]
PD#SWPL-3435

Problem:
  P321 doesn't support DTS HD decoding

Solution:
  In HDMI RX module, we add a new field to
  indicate whether the input audio is HBR.
  With this info, hal can enable the PAO
  mode  to decode the HBR audio.

Verify:
  P321

Change-Id: I6fd180e6636905f5119fe1d313214d4b56d07d5e
Signed-off-by: yujie.wu <yujie.wu@amlogic.com>

Conflicts:
	drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h
	drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_hw.c
2019-07-23 17:52:49 +09:00
shuanglong.wang
73f949cfea video: compensation omxpts for pcr check [1/1]
PD#SWPL-5664

Problem:
pcr is probably adjust when test AL1 eyepatch test case

Solution:
the time is not accurate when check pcr and omx_pts differ, because
omx_pts is used the value that be set, but pcr is current. Here add
compensation for omx_pts

Verify:
verify by nts

Change-Id: I3e0f6f006fd79cf7cac4148fd18da72111a333c7
Signed-off-by: shuanglong.wang <shuanglong.wang@amlogic.com>

Conflicts:
	drivers/amlogic/media/video_sink/video.c
2019-07-23 17:52:49 +09:00
Zongdong Jiao
e408a28f8b hdmitx: adjust PHY parameter with 5.1 ohm resistor [2/2]
PD#SWPL-2927

Problem:
No enough eye diagram when adding TMDS 5.1 ohm resistor

Solution:
adjust PHY parameter with 5.1 ohm resistor

Verify:
G12/U212

Change-Id: Ib5518613c556f9b04eb0aa374193c7a6046a7ba9
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2019-07-23 17:52:49 +09:00
Zongdong Jiao
729b388b1a hdmitx: add dongle_mode case for low power [2/2]
PD#SWPL-5302

Problem:
For dongle products, it is connected to TV directly, and some
parameters are different from mbox.

Solution:
Add dongle mode for driver's usage

Verify:
U211/S905Y2

Change-Id: Ibe45b167800d3b830d78ca8e9d7b67efd64d8564
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>

Conflicts:
	drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hw_g12a.c
2019-07-23 17:52:49 +09:00
Zongdong Jiao
625f488cb0 hdmitx: rename HDMI_IEEE_OUI to avoid conflicts [1/1]
PD#SWPL-4705

Problem:
In 61207 patch, the define HDMI_IEEE_OUI is conflicted with the kernel
head file include/linux/hdmi.h

Solution:
rename HDMI_IEEE_OUI

Verify:
GXL/P212

Change-Id: I75a12734e85478f22edf0b48636ed86e60302b58
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>

Conflicts:
	drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c
2019-07-23 17:52:49 +09:00
Zongdong Jiao
c51d9a2be3 hdmitx: add auto low latency mode(ALLM) [1/1]
PD#SWPL-4705

Problem:
Lack ALLM function

Solution:
Add ALLM function

Verify:
GXL/P212
If Rx supports ALLM, then
echo 1 > /sys/class/amhdmitx/amhdmitx0/allm_mode
otherwise it will set failed, cat allm_mode and will get 0.

Change-Id: I00233e5a5aac133b405590e7df78c7c4805ed0ef
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>

Conflicts:
	drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c
2019-07-23 17:52:49 +09:00
Pengcheng Chen
40861c581d osd: fix hotplug hdmi causes system crash [1/1]
PD#SWPL-7009

Problem:
hotplug hdmi causes system crash
when unplug hdmi display mode is null, hwc hasn't received
event and post frame normal but osd vsync lost, which caused
wait hw vsync timeout(1s), and fd leak.

Solution:
when process every frame, if display mode is null, exit frame process
just process fence.

Verify:
verified on Raven, franklin

Change-Id: Icbe7cd76776e46a6ed79c6cee3ea05772cc5f9d2
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
Jian Cao
ae04da094d osd: frame just display on half screen [1/1]
PD#SWPL-7039

Problem:
bring up osd for TM2
frame just display on half screen

Solution:
fix field_out_en value from array

Verify:
Verified on T962e2_ab319

Change-Id: Id07f3d813242f031125fcac11d3fa05205895448
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
2019-07-23 17:52:49 +09:00
Pengcheng Chen
b1d4b00658 osd: set osd1 scaler before osd blend [1/1]
PD#SWPL-6596

Problem:
bring up osd for TM2

Solution:
set osd1 scaler before osd blend

Verify:
Verified on T962e2_ab319

Change-Id: I9e7d5fa83b2edc8e9359371695ea46fa3b39e09c
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
Pengcheng Chen
e8bc6f758b osd: osd display color abnormal when run drm [1/1]
PD#SWPL-6867

Problem:
osd dispaly color abnormal because osd enable not update.

Solution:
update osd enalbe flag in drm process.

Verify:
Verified u212

Change-Id: I1c2e8b62d9d5af203c95d3d0ac940fb512dd8e5e
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
Pengcheng Chen
e5136d971e osd: add viu2 fence support [1/1]
PD#SWPL-6384

Problem:
viu2 not support fence

Solution:
add viu2 fence support.

Verify:
test pass on tl1

Change-Id: I94a5e483c88cace79b7386bb918c203ada6b8274
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>

Conflicts:
	drivers/amlogic/media/osd/osd_hw.c
2019-07-23 17:52:49 +09:00
Brian Zhu
e7e934364a vpp: add osd and video zorder control [2/6]
PD#SWPL-85

Problem:
Upper layer need control osd and video layer zorder

Solution:
1.Add video layer zorder interface by sysfs and ioctl
2.Switch the osd and video layer order in vsync

Verify:
Verify on U212

Change-Id: Ic50e81784b865cc57e4ab9a63d74806f7a8721cf
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>

Conflicts:
	drivers/amlogic/media/video_sink/video.c
	include/linux/amlogic/media/video_sink/vpp.h
2019-07-23 17:52:49 +09:00
Brian Zhu
8a0cfce510 vpp: add two layers support for each chips [1/6]
PD#SWPL-85

Problem:
Need support two video layers feature

Solution:
1.Add vd2 mif config
2.Add vd2 pps calculation and config
3.Add vd2 axis/crop/screen mode interface by sysfs and ioctl
4.Add layer query/alloc/free interface

Verify:
Verify on U212

Change-Id: I71fc9ab2ae0230c3e84c4b790e77d2c790951642
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>

Conflicts:
	drivers/amlogic/media/video_sink/video.c
	drivers/amlogic/media/video_sink/video_keeper.c
	drivers/amlogic/media/video_sink/video_priv.h
	drivers/amlogic/media/video_sink/vpp.c
	include/linux/amlogic/media/video_sink/video.h
	include/linux/amlogic/media/video_sink/vpp.h
2019-07-23 17:52:49 +09:00
Jian Cao
aa41df845e osd: osd: recovey mode always blank [1/1]
PD#TV-1287

Problem:
recovey mode always blank

Solution:
set right condition to enable free_scale

Verify:
verified on P321 board

Change-Id: I2f70b9c5436b30156f157a3297a11a2ef1cfec67
Signed-off-by: Jian Cao <jian.cao@amlogic.com>

Conflicts:
	drivers/amlogic/media/osd/osd_hw.c
2019-07-23 17:52:49 +09:00
pengcheng chen
b9e8ed0351 osd: add meson-hwc repodution rate support [1/2]
PD#SWPL-1810

Problem:
osd blend repodution rate not supported

Solution:
add meson-hwc repodution rate support

Verify:
verified on u212 dev board

Change-Id: Ied10393e240e8d3f2a1eefe17a2d4d3c965e3383
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>

Conflicts:
	drivers/amlogic/media/osd/osd.h
	drivers/amlogic/media/osd/osd_fb.c
	drivers/amlogic/media/osd/osd_hw.c
2019-07-23 17:52:49 +09:00
Evoke Zhang
dfa0f61343 lcd: optimize vbyone auto recovery with hw filter [1/1]
PD#SWPL-5172

Problem:
vbyone stable is easily affected by ESD

Solution:
increase hw filter time to anti ESD after vbyone stable,
but lower the hw filter time when vbyone training,
to avoid side effect to vbyone fsm working.
only support in TL1.

Verify:
x301

Change-Id: If8a8b14a47262abd682f5c95185e82cf3c0f58f2
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>

Conflicts:
	drivers/amlogic/media/vout/lcd/lcd_tv/lcd_drv.c
2019-07-23 17:52:49 +09:00
Evoke Zhang
2968992a4b lcd: optimize unifykey read flow to avoid crash [1/1]
PD#SWPL-4682

Problem:
lcd wait unifykey init timeout and read unifykey will crash

Solution:
incrase wait unifykey init time, and add read protection

Verify:
x301

Change-Id: Ib86a2b3b0c6c1491606404358420fd213dcfdaa8
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>

Conflicts:
	drivers/amlogic/media/vout/lcd/lcd_common.h
	drivers/amlogic/media/vout/lcd/lcd_tcon.c
	drivers/amlogic/media/vout/lcd/lcd_vout.c
2019-07-23 17:52:49 +09:00
Shaochan Liu
7450034217 lcd: add wait for gpio input value support in lcd power step [2/2]
PD#SWPL-3938

Problem:
add wait for gpio input value support in lcd power step

Solution:
add wait for gpio input value support in lcd power step

Verify:
verify by t962x-r311

Change-Id: Ie1c4ec6f9f5d91332b6b20e1d1bd2adde17e547b
Signed-off-by: Shaochan Liu <shaochan.liu@amlogic.com>

Conflicts:
	drivers/amlogic/media/vout/lcd/lcd_vout.c
2019-07-23 17:52:49 +09:00
Evoke Zhang
0e89b2d7c9 lcd: tcon: change axi_mem cma alloc api to avoid memory clear [1/1]
PD#SWPL-4554

Problem:
tcon axi memory will clear when enter kernel

Solution:
change axi_mem cma alloc api

Verify:
t309

Change-Id: Ied6ef9976e503c597818a73109b222868c0f0387
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>

Conflicts:
	drivers/amlogic/media/vout/lcd/lcd_tcon.c
2019-07-23 17:52:49 +09:00