Commit Graph

653903 Commits

Author SHA1 Message Date
Chuangcheng Peng
c6f8a9eb00 DVB: remove invalid notes
PD# none

Change-Id: I5b1292cce9d272b61df956e79c7f09adb3986a3d
Signed-off-by: Chuangcheng Peng <chuangcheng.peng@amlogic.com>
2019-07-23 17:52:49 +09:00
Cheng Tong
a56a2692e7 DVB: update external demod dts parser for attach mode
PD#163384: update external demod dts parser for attach mode

Change-Id: I17e982473d4f9d33bfc9139da141ad4ca02e0b99
Signed-off-by: Cheng Tong <cheng.tong@amlogic.com>
2019-07-23 17:52:49 +09:00
shihong.zheng
9e4260428c vh265: load ucode match with hevc->mmu_enable
PD#164365

when node mmu_enable is 0, load ucode is not matched, kernel will crash

Change-Id: Ie2ef9ee726766749be9c290ef9e9de9ed544fd24
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2019-07-23 17:52:49 +09:00
shihong.zheng
514fc8aefe vmh265: fix cannot play 4k264 when tee load
PD#166512

it must tee load mmu fw when tee enabled

Change-Id: I0ffd7c8415a77b41401b0e2ebdf697172a6b0d1d
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2019-07-23 17:52:49 +09:00
Hui Zhang
805087c9ed vdec: fixed h265 crash issue when stop
PD#166251: vh265:
when h265 stop, sometimes isr thread has not completed, vdec might be
release before isr service,so add in isr flag , and not to release vdec
until  isr thread completed.

Change-Id: I52507d24c64cfe6da68fedef0a0393eb3449b1d7
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
Jiacheng Mei
a9620e4aef update encoder firware for new fw driver
Change-Id: Iac3b35839956fa8f5322bd211d7caf819fef6439
2019-07-23 17:52:49 +09:00
Hui Zhang
d56b656a20 media_module: fix h265 crop size issue in compress
PD#165820: vh265
add resolution crop handle for compress width and height

Change-Id: I355ac7f62eb4ce4b2d737becdf3a3a2892bb8a74
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
Hui Zhang
c75776f429 media_module: fix vmh264 crash issue with teeload mode
PD#165463: vmh264: stop vdec in some dec_status

Change-Id: I5091f252e1683635fee4302eee97f8af70eb7f95
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
manhao liang
4e7f513353 dtv_mode: add si2159 into tuner checklist
PD#165368: dtv_mode: add si2159 into tuner checklist

Change-Id: I760ebb7c1144843e30353c03ff86679b493b4608
Signed-off-by: manhao liang <manhao.liang@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
077fbb3a8f fw: update and optimize the fw driver.
PD#165763:
1. optimized some codes for fw and package parse.
2. adds a feature that the fw which the best match will be loaded.
3. adds the control of the ver for parsing of fw package.

Change-Id: Ia17474df3ff90c6abbe5b617699cfca227f5ea9d
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
manhao liang
57e7a10398 dtv_demod: add tuner mxl661 to aml_dvb_probe list
PD#165368: dtv_demod: add tuner mxl661 to aml_dvb_probe list

Change-Id: If37f8973306af69bc7d89c1776f2a1dfb40b74fc
Signed-off-by: manhao liang <manhao.liang@amlogic.com>
2019-07-23 17:52:49 +09:00
Chuangcheng Peng
ac36c789d0 DVB: support dvb-t scan
PD#165368

Change-Id: I64edffc9f75f3d6529a45c066aed2e08cecc01a2
Signed-off-by: Chuangcheng Peng <chuangcheng.peng@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
03030ee8d5 vc1: supports teeload of vc1 for g12a.
PD#161616: supports teeload of vc1 for g12a.

Change-Id: I35869ed9aaf0a7d12f63cd3d5a84a531e8afe429
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
7e5bd674b6 vdec: the dec core was reset when the vdec poweron before.
PD#165053:
1. regs about the ao dos needs to be reset when reboot.
2. the hhi regs with vdec clk should be clear when the
	clock reference count minus to zero. the issue also
	needs to be amended clk tree by qiufang.

Change-Id: Idce668af7e4d8fc7e400d5907705aaf87e59043c
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Cheng Tong
5960c2b63a dvb: update i2c adapter interface
PD#163384: dvb: update i2c adapter interface

Change-Id: I73fbd4b5d1206ccb9f1c4ee8904723b753ee95f2
Signed-off-by: Cheng Tong <cheng.tong@amlogic.com>
2019-07-23 17:52:49 +09:00
wenbiao zhang
13fd1902f3 vreal: uninit when init fail
PD#163348: fix for hang up when playing video after play vreal format

Change-Id: I13fc45d6092351d86db4dfdbfd6f837d7deca605
2019-07-23 17:52:49 +09:00
Chuangcheng Peng
7613cd2882 dvb:Update demux register & support gl2a board &
support demod/tuner attach

PD#156734 Update demux register & support gl2a board


PD#163384 Support to seperate  demod & tuner

Change-Id: I85b1a38a434a832865e1c4b4aa3feeef17a58dea
Signed-off-by: Chuangcheng Peng <chuangcheng.peng@amlogic.com>
2019-07-23 17:52:49 +09:00
Hui Zhang
06924716e6 vdec: enable s805x flag
PD#163927:
1) enable s805x flag in vdec
2) fix h265 overszie handle issue on s805

Change-Id: I7b2610fe4e4d4e08e752de82eac8ab8e71f7b837
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
Rong Zhang
e91827dd3c PD#161616: VC1: 1. support vc1 decoder for G12A
2. Revert the commition of using 8 buffers for all chips
When we fix bug 128904(commit id:d723223bc) by using 8 buffers, but afterward, we
found it caused mosaic for some videos, So i revert it. I also revert the associated
ucode commition for it. This change is fit for all chips, not only G12A.

Change-Id: Idc5d2f96ca9f38208039e23da54e39f3c852e74e
Signed-off-by: Rong Zhang <rong.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
Hui Zhang
013d751cc9 vh265: fix crash issue in multi-h265 stop
PD#164394: h265_uninit_done_sema should be inited for multi-h265

Change-Id: I8e5fd16070cf859e83a0a81a0a3e503533efc048
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
shihong.zheng
f8e7781104 media_modules: schedule work to change clock
PD#159750

mutex_lock is called in (hevc)vdec_source_changed, so use
schedule_work to avoid crash in timer. all format changed.

Change-Id: Ib7e2cb3674ced63e7a2f786da734f48427f96be2
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2019-07-23 17:52:49 +09:00
wenbiao zhang
889e0ebc2d vh265: fix crash for exit h265 player
PD#164394:1) fix crash for exit h265 player
	  2) fix  tsdemux rrelease  bug which may cause system crash

Change-Id: Ibe30376cefae4d973ea906c8b0b698c9ac14e846
2019-07-23 17:52:49 +09:00
Yao.Liu
58175e2f66 decoder: fix avs && h265 vts timeout issue
PD#163674: fix avs && h265 vts timeout issue
1.remove some print info
2.use sema instead of sleep 20ms to save time in vmh265_stop

Change-Id: I17d0a23da75933a02e20500b26d783255761d9a6
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
dec79ab908 firmware: adds fws for gxm.
PD#162700:
add
    VIDEO_DEC_H264_MULTI_GXM
    VIDEO_DEC_H264_MVC_GXM

    Change-Id: I1007e9a559f3fdf7b17b43e905df5534814ccc3b
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>

Change-Id: I7af64c9be2203ddc00dcfb48dad3e20d21d3eea8
2019-07-23 17:52:49 +09:00
Jiacheng Mei
f275f946ac encoder: add hevc support for G12A[2/2]
PD#163287

Change-Id: I7651e1bff63dbb10627df16395e6944b1b0dc986
2019-07-23 17:52:49 +09:00
Nanxin Qin
a60740e751 clk: fixes an issue of the media clock set
PD#162854: fixes an issue of the media clock set

Change-Id: I8b788589c46becbfa53b83ff876c9a7570512322
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
95d2bb18af the code mpeg12 was megred from the branch of kernel 3.14 trunk
PD#162467: amports: mutex lock/unlock in create and destroy user data manager struct
PD#161160: mpeg2: correct write point to zero for cc buffer recycle

Change-Id: I2e3208623aae2073591256e3d2fb36e7875166ba
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
377ce88097 vh265: fixes an issue that using semaphore could cause crash.
PD#161077: fixes an issue that using semaphore could cause crash

Change-Id: I5ea95042a92030e298bcc026aeed48f436cf739e
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
d400f1501e avs2: fixed the issue of video image jittering then play avs2.
PD#162854: this problem is caused by the display order error

Change-Id: I81902828c32aa667e22136eb1edfcdf0639f2256
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Jiacheng Mei
539cb6716e PD#162608: add h264 encoder support for cts[2/2]
1.add encoder support for Oreo
2.change ucode load mode for h264 encoder

Change-Id: Ia407a4c205f17ecee6be1e6a741acf2bdadc04e5
Signed-off-by: Jiacheng Mei <jiacheng.mei@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
bbd068fb1c adec: the short address of the aiu fifo regs has be changed on g12a
PD#161244: the aiu fifo short address is 0x1400

Change-Id: I48b58db933b72e384e20995d10622feb8ff5c950
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
e7c986224b merges the mh264 code from the branch of kernel 3.14 trunk
PD#161201: merges mh264 code from the branch of kernel 3.14 trunk
PD#156259: mh264: add txlx double write config

Change-Id: Icb7c71e008bbe1859761f286667821258c15f5a9
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
282e3b12c9 decoder: fixes an issue that the fw loading err on the teeload mode.
PD#162054: h265 & vp9 fw load has be fixed.

Change-Id: I5a529ae09c8b1cf9b5fb52dd649905a27f9b9995
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
1953c5b00d avs: fixes an issue that avs decoding abnormal on g12a.
PD#161614: update the avs fw to match g12a

Change-Id: I7a1e86e18361b042bf2f054910042dfc842ceb7c
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
f3a40652c5 decoder: fixes some iusses
PD#161606:
1. fixes an issue that the mutex lock could sleeping on isr context.
2. update the video_ucode.bin

Change-Id: I14d73e210d64de46d20396cf8edc33c397bbc1ec
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
24412539ca stream_input: fixes an issue that check the efuse chip cause to crash.
PD#161606:
PD#161757:

Change-Id: Ieadaf82c4b9214ecb2881359d2252270bc1d9192
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
ad1060dd54 decoder: merges code from the branch of the bringup g12a
PD#161606: notes

1. fix avs2 bringup bug: config dblk_data2 and
    config HEVC_SAO_CTRL0 with lcu_size_log2

2. vdec: merge debug code from kernel 3.14,
    support step and schedule profile (multi-instance only)
    echo 0x100 > /sys/module/decoder_common/parameters/step_mode

3. decoder: fixed a bug of the vdec_profile event.
    the ISA register base has changeed to 0x3c00
    on the txlx, g12a platforms

4. decoder: modify the value of the hevc reg HEVC_DBLK_STS1
    G12A changes
    #define HEVC_DBLK_STS0 0x350f
    #define HEVC_DBLK_STS1 0x3510

5. stream_input: add a feature of check efuse status [2/2].

6. media_clock: adds media clk nodes
    echo 1 > /sys/module/media_clock/parameters/set_frq_enable
    echo 667 > /sys/module/media_clock/parameters/vdec_frq
    echo 667 > /sys/module/media_clock/parameters/hevc_frq
    echo 667 > /sys/module/media_clock/parameters/hevcb_frq

7. media_modules: revised dolby vision macro control for g12a

8. ucode: update the video_ucode.bin

Change-Id: Icf781a1e5f8095bd1b14a2b21e525683ad0cc22d
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Hui Zhang
da8c215f60 media_module: fix vmh264 playback freeze issue
PD#161180:
   1) adjust timeout trigger threshold to prevent an instance not
      being in a deadloop when decoding error happened
   2) add check to a invalid display_q len

Change-Id: I9a8fcc2891aca5b03b75c54b5a9cf2514ed28ca7
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
Tellen Yu
4038ecf3fb media_modules: build system changed for Android.mk from P [21/28]
PD# NONE

https://android.googlesource.com/platform/build/+/master/Changes.md

Change-Id: I46221a53a1db08c178ef43aaa09d907e43bfd10a
2019-07-23 17:52:49 +09:00
Hui Zhang
f2c3099fad media_module: fix vmh264 mosaic issue
PD#160726
for longtime run, some stream error might cause pic_dc hardware in wrong state, it can't be recovery,
so this hardware module need to be reset at beginning of decoding slice. mosaic issue will be gone

Change-Id: I850ecfc08b45a66e15ce9a41dbf1d550fe55f640
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
zhilei.wu
9f61900e4d media_modules: revised dolby vision macro control for g12a
PD#157605: media_modules: revised dolby vision macro control for g12a

Change-Id: I4a6bb3e904782d87916ea303c74da9e47404e366
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
2019-07-23 17:52:49 +09:00
Yvonne Chen
dc28161f64 media_modules: sec firmload extend with vdec type
PD#159071
	1.change tee load call with vdec type
        2. fixed h264 mmu crashed bug.

Change-Id: I4114a2d0d8c5837a6c51457472bfc0ceca17a99d
Signed-off-by: Yvonne Chen <yvonne.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
shihong.zheng
3f36210b0b mpeg12: fix crash in timer when change clk
PD#155701

timer soft-irq cann't mutex_lock,add schedule work
to change source clk.

Change-Id: I199e3e480523ae546b91155113dc269b45e7beea
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2019-07-23 17:52:49 +09:00
Zhi Zhou
5cd9351020 media: fix unsupport 12bit may crashed bug.
PD#159195
PD#159359
	1. unspport 12 bit depth,
	   set fatal_error,when >=10bit;
	2. doublewtite 0x100 crash bug.

Change-Id: I6366b769c3be75b3cc44e606d3317272053b6723
2019-07-23 17:52:49 +09:00
Zhi Zhou
a79cbb7c4a decoder: vp9 doublewrite only support [1/1]
PD#158925

	1. vp9 add double write only support
	2. del MMU_ENABEL macro
	3. detect mmu enable by double_write mode.

Change-Id: If755331e4fc1b91a847df081a6c58e24c98f08a5
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
2019-07-23 17:52:49 +09:00
Yao.Liu
885ec2499b vdec: optimize video latency
PD#156224: reduce sleep time in vdec_core_thread

Change-Id: Ie70d1dbaecf0174fa9e6daa52378113165568efe
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
2019-07-23 17:52:49 +09:00
Zhi Zhou
1e6d885a6a media: format drivers code for upstream.
PD#157273

	1. format code as kernel's format.
	2. add kernel's format scripts to this script dir.

Change-Id: Id45c0919d0476b2cd990b027e80bbe7fed3a90be
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
5cb7626bc3 decoder: fixed the issure of the h264 4k source can not playback.
PD#156749: add the h264 mmu fw and update the ucode bin.

Change-Id: Icd1ecaedd9276281dd68da4c5e4624b6e9a32d2c
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
shuanglong wang
38d5f13777 Revert "decoder: fixed the issure of the h264 4k source can not playback."
This reverts commit a85e88b3d90c6818c599af62b3fc66126067ea19.

Change-Id: Ib126689e66c5bf097df6fb0f863831da2ecaa470
2019-07-23 17:52:49 +09:00
Nanxin Qin
0b1d56559c decoder: fixed the issure of the h264 4k source can not playback.
PD#156749: add the h264 mmu fw and update the ucode bin.

Change-Id: Ie0c2590d0547d44a97119737cd784f950d3d1b77
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00