Commit Graph

653820 Commits

Author SHA1 Message Date
Nanxin Qin
256cfa1fd4 makefile: fixed the issure of Media.mk
Change-Id: Ib842b3c1354fbb6081969a1d77580c92204ce6fe
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
09bbdb6639 media_modules: merged code from 43177e6a on the amlogic-3.14-dev [2/3]
PD#150739: merged code from 43177e6a on the amlogic-3.14-dev
1.decoder: vmh264, fix multi pic in one packet
2.decoder: add amvdec_stop when error reset
3.clk: switch vdec clk source when suspend

Change-Id: I43b8f5a7a13d880c130505cd21e08c8e1eb4cf38
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Yao.Liu
720eaaed05 vp9 decoder: optimize vp9 init for vts [2/2]
Change-Id: I528cf32ff25c6c79177478ba3dc77fe29ba4838e
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
2019-07-23 17:52:49 +09:00
Yuxi Sun
20484d209a PD#146466: h264 encoder: update h264 ucdoe
Change-Id: I378c53d819767171b6eedbfb2881dce5ec9679c1
Signed-off-by: Yuxi Sun <yuxi.sun@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
83f60ad655 decoder: fixed the issure of mem to avoid leak.
PD#150221: fixed the issure of mem to avoid leak.

Change-Id: Id1ef51e30cfab718e5e57881af5d84eb2609d1b1
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
50a3479782 decoder: fixed a issure of the memory leak when the seek.
PD#150221: fixed a issure of the memory leak when the seek.

Change-Id: Ie11a942f08cfeab59a6e4e7452c82bab62ec5f36
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
f34d529e67 decoder: modify modules dir in the sysfs to compatible with kernel 3.14 [3/3]
PD#150498: modify modules dir in the sysfs to compatible with kernel 3.14

Change-Id: Ie2f5ef1d0473f1683e991ba405e5347e0d95f6db
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
db869884eb media_clock: change the spinlock into the mutexlock to avoid crash.
PD#150369: change the spinlock into the mutexlock to avoid crash.

Change-Id: I96528c1e496d0bc4ff984036a5d36b373732c932
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
8f480325ae decoder: the ionvideo feature was supported
PD#150258: the ionvideo feature was supported

Change-Id: I925d988b57ce058d00cca6bab08d568a06192de7
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
liangzhuo.xie
2018a9c504 PD#149614: fix param null pointer error.
Change-Id: I3e4627353fc5008269a1a5c82bbe9193aa6ff599
2019-07-23 17:52:49 +09:00
Nanxin Qin
63775cf5db decoder: fixed firmware load issure in mult-instance mode.
PD#149867: fixed firmware load issure in mult-instance mode

Change-Id: I68ddae7225e582d2081e4c1e4675c42e3b88ffad
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
5a6207e1e1 media_modules: merged code from 43177e6a on the amlogic-3.14-dev
PD#146152: merged code from 43177e6a on the amlogic-3.14-dev

1. support for multi-instance features
2. some issures with the restoration of H.264/H.265/vp9 in
multiple-instance mode
3. optimized switch gate and decoder clk

Change-Id: Iff829f6e4058c7001901e65c03e283a82fd1ec4a
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
e3523adaab change UCODE_OUT directory [2/2]
PD# NONE

change the directory of ucode_out to vendor/lib/firmware/video

Change-Id: Iceaa4f9699cdd62a2827920a6dc13a76c4a1450e
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
7fb33bed00 add the path of UCODE_OUT [2/2]
PD# NONE

copy the fimware to the UCODE_OUT.

Change-Id: Ia7815156ba4219f7b4a7582322028b3391df9253
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Hualing Chen
a92859716f PD#147721: media_modules: add dvb driver
1.add dvb stb dmx and frontend driver

Change-Id: I8d05bf46320cc7111bbbc215198997b3747bbe49
Signed-off-by: Hualing Chen <hualing.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
Xindong Xu
8cca8ae22f copy ko to lib_vendor
Change-Id: I5dc31f76da72f0413cb302ae2991b58a9f769d62
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2019-07-23 17:52:49 +09:00
Xindong Xu
e14836c975 PD#145255: generate amlogic files to vendor/
Change-Id: I5c8cad08b992cf688d09190af3a7a879fa77a43e
2019-07-23 17:52:49 +09:00
Nanxin Qin
c5f0a5ef09 add drivers of the multimedia
Change-Id: Icde0895b71770e393cb6a61bedf04aa199f6463d
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
afl1
0f1ea98bbe Revert "ODROID-COMMON: slipstream Amlogic drivers"
This reverts commit 5ef121eb61.
2019-07-23 17:52:49 +09:00
Kevin Kim
ff66238b3e ODROID-N2:Merge amlogic BSP 2019.0415
Change-Id: I0eab66ee8951fe297a7c831f6b90652314a4972a
2019-07-23 17:52:49 +09:00
Wenfeng Guo
8c30037ad1 di: fix TL1 cave video 1080i 60hz have drawing [1/1]
PD#SWPL-7006

Problem:
TL1 cave video 1080i 60hz have drawing.

Solution:
dark scenes don't into pulldown32 by vlsi yanling

Verify:
TL1

Signed

Change-Id: Ib77c0f99940c416943baa9b9a8a02a059b274e5b
Signed-off-by: Wenfeng Guo <wenfeng.guo@amlogic.com>
2019-07-23 17:52:49 +09:00
Yong Qin
ebbc51cfa6 di: small window bottom of the screen no video [1/1]
PD#TV-4708

Problem:
small window,v scaling mode, bottom of the screen is no video.

Solution:
vline is odd, mif out is not more enouth

Verify:
verify on TL1

Change-Id: I2ac35af3632e8b14df5c773b322d4b2d64b050ba
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Yong Qin
7104d5ed92 di: small window bottom of the screen is blank [1/1]
PD#TV-4708

Problem:
small window, bottom of the screen is covered by
blank on the online video

Solution:
vline is odd, mif out is not right

Verify:
verify on TL1

Change-Id: I39eb0cdfd2f4b200a09a9c8b779f509caf6dea37
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Wenfeng Guo
1257af5e20 deinterlace: fix tl1 in 1080i has small sawtooth [1/1]
PD#SWPL-4072

Problem:
tl1 1080i in some dark scenes and roller coasters
have small sawtooth

Solution:
adjust a set of registers with special motion

Verify:
tl1

Change-Id: Idbe62e823f1c6c683b67d000978de1862c8e3162
Signed-off-by: Wenfeng Guo <wenfeng.guo@amlogic.com>
2019-07-23 17:52:49 +09:00
Yong Qin
f70db4be00 Revert "di: change clkb frq from 500 to 667 [1/1]"
This reverts commit c75a783c42.

Change-Id: I2bf82f1ceeebc1377d45b76ee1d2563811c154ca
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Yong Qin
d5edafddec di: bringup for tm2 [1/1]
PD#SWPL-6575

Problem:
chip bring up

Solution:
1.add tm2 chip id for tm2
2.add h scaling down function for tm2

Verify:
tm2

Change-Id: I364d7c07be331d81ef546357445225c6071f8e3c
Signed-off-by: Yong Qin <yong.qin@amlogic.com>

Conflicts:
	drivers/amlogic/media/deinterlace/deinterlace.c
	drivers/amlogic/media/deinterlace/deinterlace_dbg.c
	drivers/amlogic/media/deinterlace/deinterlace_hw.c
	drivers/amlogic/media/deinterlace/nr_drv.c
2019-07-23 17:52:49 +09:00
Yong Qin
f0f35b4b77 di: change clkb frq from 500 to 667 [1/1]
PD#SWPL-6762

Problem:
di clkb frq is not right

Solution:
change from 500 to 667

Verify:
tl1

Change-Id: I9c62bb9936630937f19d8a6b490a8266d73a268c
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Yong Qin
5e600034e6 di: monkey test di cause crash [1/1]
PD#SWPL-6133

Problem:
monkey test di cause crash,when is di reg processing, unreg event
attach, and released the di buffer, so cause crash.

Solution:
every unreg event received, need waitting reg process had done.

Verify:
tl1

Change-Id: I2f2bb068ed65ab14ab4f09de96b64d7290da5914
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
zhiwei.yuan
f2d5089e0b di: "DI: di_init_buf vmap fail" is seen when power on [1/1]
PD#SWPL-5908

Problem:
execute vmap when di reserved memory is disable

Solution:
skip memory calculation in init buf  while using cma

Verify:
verified by t962x2_x301

Change-Id: Ib0c2e422f61f2b4182109cb7bbb3107029363ce0
Signed-off-by: zhiwei.yuan <zhiwei.yuan@amlogic.com>
2019-07-23 17:52:49 +09:00
Yong Qin
08290d7ec9 di: av to dtv , black screen [1/1]
PD#SWPL-6096

Problem:
from local av switch to dtv,black screen,then search channel

Solution:
revert the modification "62617"

Verify:
tl1

Change-Id: I49ae627b9f0b1f6a776e5cbffc723a43e85cee72
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Yong Qin
d289c1307c di: The last frame of the video flash garbage [1/1]
PD#SWPL-6070

Problem:
flash garbages when unreg process.

Solution:
can't speed down the clkb rate, there is a mirror mode

Verify:
tl1

Change-Id: I5fcc29a1cda196992a457f40fee31992f4bc1528
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Yong Qin
c348b65736 di: flash green when play 265 SD video [1/1]
PD#SWPL-6097

Problem:
flash green garbages when play h.265 SD video

Solution:
afbc input not enable

Verify:
tl1

Change-Id: I310eeb6d922ab8b9035c815afc4e967c0e5390ff
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Yong Qin
4590122d39 di: exit play local 4k video flashing [1/1]
PD#SWPL-5877

Problem:
1.afbc mode, play h.265 local video, when exit playing,
screen will flashing sometimes.
2.when exit playing, there cost 5s time.

Solution:
4k video di bypass, afbc hw module used by vpp, when
DI unreg, needn't to disable AFBC moudule.

Verify:
tl1

Change-Id: I2ac66a145a009042d286dda50e7259657f4bfc8e
Signed-off-by: Yong Qin <yong.qin@amlogic.com>

Conflicts:
	drivers/amlogic/media/deinterlace/deinterlace.c
2019-07-23 17:52:49 +09:00
Yong Qin
e5cf70280d di: pretect reg unreg flow [1/1]
PD#SWPL-4918

Problem:
when reg unreg event called too fast, di cause system crash

Solution:
pretect reg and unreg flow

Verify:
tl1

Change-Id: I9b3e28c2b0b709d4f53f60b1f044a390933117ce
Signed-off-by: Yong Qin <yong.qin@amlogic.com>

Conflicts:
	drivers/amlogic/media/deinterlace/deinterlace.c
2019-07-23 17:52:49 +09:00
Yong Qin
ca322d7a1b di: 1080p,the screen display anormal [1/1]
PD#SWPL-5874

Problem:
1080p the screen display anormal

Solution:
compress mode, modify vdin frame type.

Verify:
tl1

Change-Id: Ic1ee1472105861c8debce2a1645f70ed617fd132
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Yong Qin
50ae6deb59 di: support the interlace format from vdin afbc [2/2]
PD#SWPL-5205

Problem:
support afbc from vdin and decoder on tl1

Solution:
1.add this function
2.support from vdin and decoder

Verify:
tl1

Change-Id: I258d40ad5706f4a9a5749298dd9a33a9b4bbafa2
Signed-off-by: Yong Qin <yong.qin@amlogic.com>

Conflicts:
	drivers/amlogic/media/deinterlace/deinterlace.c
	drivers/amlogic/media/deinterlace/deinterlace_hw.c
2019-07-23 17:52:49 +09:00
zhiwei.yuan
0c513a2b81 di: TL1 enable lmv_lock_win_en cause crash [1/1]
PD#SWPL-4999

Problem:
use vmalloc in interrupt context

Solution:
move di_map to cma allocate function(kernel thread)

Verify:
verified by t962x2_x301

Change-Id: I8cf8d9caf9703ba039b32da98d2382a4c875de30
Signed-off-by: zhiwei.yuan <zhiwei.yuan@amlogic.com>
2019-07-23 17:52:49 +09:00
Yong Qin
e7af75d340 di: disable afbc on tl1 [1/1]
PD#SWPL-3413

Problem:
when playing SD/HD/VP9/H265 video, there
are 3 veritcal lines on the picture.

Solution:
disable afbc

Verify:
verified on tl1

Change-Id: I839d8f26aefdf2c71272d8d3e7bf93e4c3294491
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Jihong Sui
0a23be6422 deinterlace: pq: adjust pulldown setting for tl1 [1/1]
PD#SWPL-3182

Problem:
1.VLSI(Feijun) fine-tune pulldown setting for TL1, G12A/B;
2.fine tune combing_glbmot_radprat by VLSI(yanling.liu);

Solution:
finetune setting.

Verify:
tl1

Change-Id: Ie65cec8b216752600dfd54ee6be5302150282774
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
2019-07-23 17:52:49 +09:00
huaihao guo
70cac90710 deinterlace: Add AFBC support on TL1 [1/1]
PD#SWPL-3113

Problem:
Add AFBC support on TL1

Solution:
Add AFBC support on TL1

Verify:
T962x2-x301

Change-Id: Ib4f40f6ca0cbb1553bf4f76848d1649822dda3e8
Signed-off-by: huaihao.guo <huaihao.guo@amlogic.com>
2019-07-23 17:52:49 +09:00
Jihong Sui
56e2c4d447 deinterlace: pq: adjust cue setting for tl1 [1/1]
PD#SWPL-2984

Problem:
VLSI(yanling.liu) fine-tune cue setting for TL1.

Solution:
add new setting.

Verify:
tl1

Change-Id: I99c32d994687650dc851dd2fb8c0464e8ffd21b5
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>

Conflicts:
	drivers/amlogic/media/deinterlace/deinterlace.c
2019-07-23 17:52:49 +09:00
Jihong Sui
cd21f1c613 deinterlace: there's a change to hang in shutdown [1/1]
PD#OTT-778

Problem:
1.kernel received reboot command, but hang in shutdown

Solution:
move tasklet_disable behind tasklet_kill

Verify:
P321

Change-Id: I994c21c5aeb42dbbb4e3b50ccac8376db4d4039d
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
2019-07-23 17:52:49 +09:00
wenfeng.guo
5bc20f13a4 deinterlace: add support for tl1 [1/1]
PD#172587

Problem:
bringup tl1

Solution:
add deinterlace driver support for tl1

Verify:
verified on tl1 x301

Change-Id: I3bf008a4f948cdc2c11f14f81944695d6a185b14
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/tl1_pxp.dts
	arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts
	drivers/amlogic/media/deinterlace/deinterlace.c
	drivers/amlogic/media/deinterlace/deinterlace_dbg.c
	drivers/amlogic/media/deinterlace/deinterlace_hw.c
	drivers/amlogic/media/deinterlace/nr_drv.c
2019-07-23 17:52:49 +09:00
wenfeng.guo
8e075a7ced deinterlace: fix CMA layout adaptation di_cma_reserved [1/1]
PD#SWPL-2308

Problem:
CMA layout adaptation di_cma_reserved cause crash

Solution:
fix CMA layout adaptation di_cma_reserved

Verify:
P321

Change-Id: Ia24e811a02d47d70afa1c06361fd0852c357394c
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>

Conflicts:
	drivers/amlogic/media/deinterlace/deinterlace.c
	drivers/amlogic/media/deinterlace/deinterlace_hw.c
	drivers/amlogic/media/deinterlace/deinterlace_hw.h
2019-07-23 17:52:49 +09:00
huaihao.guo
32376b037b deinterface: temporary remove afbc support on chip after g12a [1/1]
PD#172587

Problem:
afbc now support on chip txlx and g12a,
but we use cpu_after_eq(G12A) to judge
if afbc is support or not.

Solution:
use is_meson_g12a_cpu() replace cpu_after_eq(G12A).

Verify:
u200(g12a),t962x_r311

Change-Id: I3fb7ed54f7137fada97481177e40a2543cf8df9f
Signed-off-by: huaihao guo <huaihao.guo@amlogic.com>
2019-07-23 17:52:49 +09:00
huaihao.guo
e3701d133e deinterface: add afbc support on g12a and txlx [1/1]
PD#SWPL-1618

Problem:
Add afbc support on g12a and txlx

Solution:
add afbc support on g12a and txlx

Verify:
T962X-R311, U200(G12A)

Change-Id: Ia0cce8516a98653b01c3bc628e812c3a81b1df59
Signed-off-by: huaihao.guo <huaihao.guo@amlogic.com>

Conflicts:
	drivers/amlogic/media/deinterlace/deinterlace.c
	drivers/amlogic/media/deinterlace/deinterlace_hw.c
2019-07-23 17:52:49 +09:00
Kevin Kim
3a03ee7c2e ODROID-N2: Merge amlogic BSP 2019.0415 (fix build err)
Change-Id: I1987cce33154a36658b066f44ce1463d267d0043
2019-07-23 17:52:49 +09:00
Zhe Wang
b157b2fb93 audio: TM2 bringup: enable ADC for linein [1/1]
PD#SWPL-7027

Problem:
audio path AVin is on audio

Solution:
enable ADC for linein

Verify:
Verify on AB311

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

Conflicts:
	arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
	arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
	arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
	arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts
	sound/soc/codecs/amlogic/ad82584f.c
2019-07-23 17:52:49 +09:00
Zhe Wang
39aa653f77 audio: TM2: bringup AMP ti5805 on ab301 [1/1]
PD#SWPL-7074

Problem:
speaker doesn't work

Solution:
bringup AMP ti5805 on ab301

Verify:
Verified on T962x3_ab301

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

Conflicts:
	arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
2019-07-23 17:52:49 +09:00
Zhe Wang
24b7a86956 audio: TM2 audio basic function bringup [1/1]
PD#SWPL-6721

Problem:
TM2 bringup

Solution:
audio basic function bringup

Verify:
Verified on T962e2_ab311

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

Conflicts:
	arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
2019-07-23 17:52:49 +09:00