shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

dvb: optimize AV SYNC procession.Merge from 3.14 pcrscr master

Browse Source 
PD#167562: AV SYNC procession.merge 3.14 pcrscr master

Change-Id: Ied535033acb2de8e7f1a2d53290a260dcaa4db42
Signed-off-by: manhao liang <manhao.liang@amlogic.com>
This commit is contained in:
manhao liang
2018-05-22 17:04:17 +08:00
committed by Dongjin Kim
parent 18b3f31e3a
commit d52957f566
5 changed files with 96 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/amlogic/media_modules/common/media_clock/switch/amports_gate.c
View File

@@ -43,6 +43,9 @@ struct gate_switch_node gates[] = {
{
.name = "vdec",
},
{
.name = "clk_81",
},
{
.name = "clk_vdec_mux",
},

4
drivers/amlogic/media_modules/stream_input/amports/amstream.c
View File

@@ -3733,6 +3733,8 @@ static struct mconfig amports_configs[] = {
MC_FUN_ID("videobufused", videobufused_show_fun, NULL, 0),
};
/*static struct resource memobj;*/
static int amstream_probe(struct platform_device *pdev)
{
@@ -3783,7 +3785,7 @@ static int amstream_probe(struct platform_device *pdev)
r = (-EIO);
goto error3;
}
tsdemux_tsync_func_init();
init_waitqueue_head(&amstream_sub_wait);
init_waitqueue_head(&amstream_userdata_wait);
reset_canuse_buferlevel(10000);

1
drivers/amlogic/media_modules/stream_input/parser/hw_demux/aml_dmx.c
View File

@@ -385,6 +385,7 @@ static void dmxn_op_chan(int dmx, int ch, int(*op)(int, int), int ch_op)
((0<<(AUDIO_SPLICING_POINT)) |\
(0<<(VIDEO_SPLICING_POINT)) |\
(1<<(OTHER_PES_READY)) |\
(1<<(PCR_READY)) |\
(1<<(SUB_PES_READY)) |\
(1<<(SECTION_BUFFER_READY)) |\
(0<<(OM_CMD_READ_PENDING)) |\

104
drivers/amlogic/media_modules/stream_input/parser/tsdemux.c
View File

@@ -24,6 +24,7 @@
#include <linux/fs.h>
#include <linux/dma-mapping.h>
#include <linux/amlogic/media/frame_sync/ptsserv.h>
#include <linux/amlogic/media/frame_sync/tsync.h>
#include <linux/amlogic/media/utils/amstream.h>
#include <linux/amlogic/media/vfm/vframe_provider.h>
#include <linux/device.h>
@@ -61,6 +62,9 @@ static u32 fetch_done;
static u32 discontinued_counter;
static u32 first_pcr;
static u8 pcrscr_valid;
static u8 pcraudio_valid;
static u8 pcrvideo_valid;
static u8 pcr_init_flag;
static int demux_skipbyte;
@@ -215,6 +219,7 @@ static int tsdemux_config(void)
return 0;
}
static void tsdemux_pcr_set(unsigned int pcr);
/*TODO irq*/
static irqreturn_t tsdemux_isr(int irq, void *dev_id)
{
@@ -284,6 +289,11 @@ static irqreturn_t tsdemux_isr(int irq, void *dev_id)
/* pr_info("subtitle pes ready\n"); */
wakeup_sub_poll();
}
if (int_status & (1<<PCR_READY)) {
unsigned int pcr_pts = 0xffffffff;
pcr_pts = DMX_READ_REG(id, PCR_DEMUX);
tsdemux_pcr_set(pcr_pts);
}
if (!enable_demux_driver())
WRITE_DEMUX_REG(STB_INT_STATUS, int_status);
@@ -367,14 +377,15 @@ static ssize_t _tsdemux_write(const char __user *buf, size_t count,
return count - r;
}
#define PCR_EN 12
static int reset_pcr_regs(void)
{
u32 pcr_num;
u32 pcr_regs = 0;
if (curr_pcr_id >= 0x1FFF)
return 0;
/* set parameter to fetch pcr */
/* set paramater to fetch pcr */
pcr_num = 0;
if (curr_pcr_id == curr_vid_id)
pcr_num = 0;
@@ -384,45 +395,46 @@ static int reset_pcr_regs(void)
pcr_num = 2;
else
pcr_num = 3;
if (pcr_num != curr_pcr_num) {
u32 clk_unit = 0;
u32 clk_81 = 0;
struct clk *clk;
clk = clk_get_sys("clk81", "clk81");
//clk = clk_get(NULL,"clk81");
clk= devm_clk_get(amports_get_dma_device(),"clk_81");
if (IS_ERR(clk) || clk == 0) {
pr_info("[%s:%d] error clock\n", __func__,
__LINE__);
pr_info("[%s:%d] error clock\n", __func__, __LINE__);
return 0;
}
clk_81 = clk_get_rate(clk);
clk_unit = clk_81 / 80000;
clk_unit = clk_81 / 90000;
pr_info("[%s:%d] clk_81 = %x clk_unit =%x\n", __func__,
__LINE__, clk_81, clk_unit);
pcr_regs = 1 << PCR_EN | clk_unit;
pr_info("[tsdemux_init] the set pcr_regs =%x\n", pcr_regs);
if (READ_DEMUX_REG(TS_HIU_CTL_2) & 0x80) {
WRITE_DEMUX_REG(PCR90K_CTL_2, (12 << 1) | clk_unit);
WRITE_DEMUX_REG(PCR90K_CTL_2, pcr_regs);
WRITE_DEMUX_REG(ASSIGN_PID_NUMBER_2, pcr_num);
pr_info("[tsdemux_init] To use device 2,pcr_num=%d\n",
pcr_num);
pr_info("tsdemux_init] the read pcr_regs= %x\n",
READ_DEMUX_REG(PCR90K_CTL_2));
} else if (READ_DEMUX_REG(TS_HIU_CTL_3) & 0x80) {
WRITE_DEMUX_REG(PCR90K_CTL_3, (12 << 1) | clk_unit);
WRITE_DEMUX_REG(PCR90K_CTL_3, pcr_regs);
WRITE_DEMUX_REG(ASSIGN_PID_NUMBER_3, pcr_num);
pr_info("[tsdemux_init] To use device 3,pcr_num=%d\n",
pcr_num);
pr_info("tsdemux_init] the read pcr_regs= %x\n",
READ_DEMUX_REG(PCR90K_CTL_3));
} else {
WRITE_DEMUX_REG(PCR90K_CTL, (12 << 1) | clk_unit);
WRITE_DEMUX_REG(PCR90K_CTL, pcr_regs);
WRITE_DEMUX_REG(ASSIGN_PID_NUMBER, pcr_num);
pr_info("[tsdemux_init] To use device 1,pcr_num=%d\n",
pcr_num);
pr_info("tsdemux_init] the read pcr_regs= %x\n",
READ_DEMUX_REG(PCR90K_CTL));
}
curr_pcr_num = pcr_num;
}
return 1;
}
@@ -433,6 +445,9 @@ s32 tsdemux_init(u32 vid, u32 aid, u32 sid, u32 pcrid, bool is_hevc,
u32 parser_sub_start_ptr;
u32 parser_sub_end_ptr;
u32 parser_sub_rp;
pcrvideo_valid = 0;
pcraudio_valid = 0;
pcr_init_flag = 0;
/* #if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON6 */
/*TODO clk */
@@ -636,10 +651,12 @@ s32 tsdemux_init(u32 vid, u32 aid, u32 sid, u32 pcrid, bool is_hevc,
if (vid < 0x1FFF) {
curr_vid_id = vid;
tsdemux_set_vid(vid);
pcrvideo_valid = 1;
}
if (aid < 0x1FFF) {
curr_aud_id = aid;
tsdemux_set_aid(aid);
pcraudio_valid = 1;
}
if (sid < 0x1FFF) {
curr_sub_id = sid;
@@ -681,12 +698,12 @@ void tsdemux_release(void)
{
pcrscr_valid = 0;
first_pcr = 0;
pcr_init_flag = 0;
WRITE_PARSER_REG(PARSER_INT_ENABLE, 0);
WRITE_PARSER_REG(PARSER_VIDEO_HOLE, 0);
WRITE_PARSER_REG(PARSER_AUDIO_HOLE, 0);
/*TODO irq */
vdec_free_irq(PARSER_IRQ, (void *)tsdemux_fetch_id);
@@ -715,14 +732,12 @@ void tsdemux_release(void)
pts_stop(PTS_TYPE_AUDIO);
WRITE_RESET_REG(RESET1_REGISTER, RESET_PARSER);
#ifdef CONFIG_AMLOGIC_MEDIA_MULTI_DEC
SET_PARSER_REG_MASK(PARSER_ES_CONTROL, ES_VID_MAN_RD_PTR);
WRITE_PARSER_REG(PARSER_VIDEO_WP, 0);
WRITE_PARSER_REG(PARSER_VIDEO_RP, 0);
SET_PARSER_REG_MASK(PARSER_ES_CONTROL, ES_VID_MAN_RD_PTR);
WRITE_PARSER_REG(PARSER_VIDEO_WP, 0);
WRITE_PARSER_REG(PARSER_VIDEO_RP, 0);
#endif
/* #if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON6 */
/*TODO clk */
/*
@@ -1127,3 +1142,46 @@ u8 tsdemux_pcrscr_valid(void)
{
return pcrscr_valid;
}
u8 tsdemux_pcraudio_valid(void)
{
return pcraudio_valid;
}
u8 tsdemux_pcrvideo_valid(void)
{
return pcrvideo_valid;
}
void tsdemux_pcr_set(unsigned int pcr)
{
if (pcr_init_flag == 0) {
timestamp_pcrscr_set(pcr);
timestamp_pcrscr_enable(1);
pcr_init_flag = 1;
}
}
void tsdemux_tsync_func_init(void)
{
register_tsync_callbackfunc(
TSYNC_PCRSCR_VALID, (void *)(tsdemux_pcrscr_valid));
register_tsync_callbackfunc(
TSYNC_PCRSCR_GET, (void *)(tsdemux_pcrscr_get));
register_tsync_callbackfunc(
TSYNC_FIRST_PCRSCR_GET, (void *)(tsdemux_first_pcrscr_get));
register_tsync_callbackfunc(
TSYNC_PCRAUDIO_VALID, (void *)(tsdemux_pcraudio_valid));
register_tsync_callbackfunc(
TSYNC_PCRVIDEO_VALID, (void *)(tsdemux_pcrvideo_valid));
register_tsync_callbackfunc(
TSYNC_BUF_BY_BYTE, (void *)(get_buf_by_type));
register_tsync_callbackfunc(
TSYNC_STBUF_LEVEL, (void *)(stbuf_level));
register_tsync_callbackfunc(
TSYNC_STBUF_SPACE, (void *)(stbuf_space));
register_tsync_callbackfunc(
TSYNC_STBUF_SIZE, (void *)(stbuf_size));
}

8
drivers/amlogic/media_modules/stream_input/parser/tsdemux.h
View File

@@ -25,6 +25,7 @@
#define VIDEO_PTS_READY 0
#define DIS_CONTINUITY_PACKET 6
#define SUB_PES_READY 7
#define PCR_READY 11
#define PARSER_INTSTAT_FETCH_CMD (1<<7)
@@ -82,7 +83,11 @@ extern ssize_t tsdemux_write(struct file *file,
extern u32 tsdemux_pcrscr_get(void);
extern u8 tsdemux_pcrscr_valid(void);
extern u8 tsdemux_pcraudio_valid(void);
extern u8 tsdemux_pcrvideo_valid(void);
extern u32 tsdemux_first_pcrscr_get(void);
extern void timestamp_pcrscr_enable(u32 enable);
extern void timestamp_pcrscr_set(u32 pts);
int tsdemux_class_register(void);
void tsdemux_class_unregister(void);
@@ -92,4 +97,7 @@ void tsdemux_audio_reset(void);
void tsdemux_sub_reset(void);
void tsdemux_set_skipbyte(int skipbyte);
void tsdemux_set_demux(int dev);
void tsdemux_tsync_func_init(void);
#endif /* TSDEMUX_H */