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

dv: fixed compile error when disable CONFIG_DOLBYVISION

Browse Source 
PD#162653: dv: fixed compile error when disable CONFIG_DOLBYVISION

Change-Id: Ia56e72deb9d4d47d38beff6295eee2d9e99b6d58
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
This commit is contained in:
zhilei.wu
2018-03-21 16:56:26 +08:00
committed by Yixun Lan
parent 2ce3582aba
commit 72ee0d6143
5 changed files with 85 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/amlogic/media/enhancement/amvecm/amcm.c
View File

@@ -282,8 +282,10 @@ void amcm_level_sel(unsigned int cm_level)
am_set_regmap(&cmreg_enhancement);
else
am_set_regmap(&cmreg_optimize);
if (!is_dolby_vision_enable()) {
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (!is_dolby_vision_enable())
#endif
{
if (!(READ_VPP_REG(VPP_MISC) & (0x1 << 28)))
WRITE_VPP_REG_BITS(VPP_MISC, 1, 28, 1);
WRITE_VPP_REG(VPP_CHROMA_ADDR_PORT, 0x208);

15
drivers/amlogic/media/enhancement/amvecm/amvecm.c
View File

@@ -903,8 +903,12 @@ int amvecm_on_vs(
{
int result = 0;
if ((probe_ok == 0) || for_dolby_vision_certification())
if (probe_ok == 0)
return 0;
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (for_dolby_vision_certification())
return 0;
#endif
if (flags & CSC_FLAG_CHECK_OUTPUT) {
/* to test if output will change */
return amvecm_matrix_process(
@@ -958,7 +962,9 @@ void refresh_on_vs(struct vframe_s *vf)
return;
if (vf != NULL) {
vpp_get_vframe_hist_info(vf);
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (!for_dolby_vision_certification())
#endif
ve_on_vs(vf);
vpp_backup_histgram(vf);
}
@@ -3179,9 +3185,10 @@ static void amvecm_pq_enable(int enable)
{
if (enable) {
vecm_latch_flag |= FLAG_VE_DNLP_EN;
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (!is_dolby_vision_enable())
#endif
amcm_enable();
WRITE_VPP_REG_BITS(SRSHARP0_PK_NR_ENABLE, 1, 1, 1);
WRITE_VPP_REG_BITS(SRSHARP1_PK_NR_ENABLE, 1, 1, 1);
@@ -4098,10 +4105,14 @@ static void aml_vecm_dt_parse(struct platform_device *pdev)
/* init module status */
amvecm_wb_init(wb_en);
amvecm_gamma_init(gamma_en);
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (!is_dolby_vision_enable())
#endif
WRITE_VPP_REG_BITS(VPP_MISC, 1, 28, 1);
if (cm_en) {
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (!is_dolby_vision_enable())
#endif
amcm_enable();
}
else

65
drivers/amlogic/media/video_sink/video.c
View File

@@ -534,6 +534,21 @@ static int content_top = 0, content_left = 0, content_w = 0, content_h;
static int scaler_pos_changed;
#endif
#ifndef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
bool is_dolby_vision_enable(void)
{
return 0;
}
bool is_dolby_vision_on(void)
{
return 0;
}
bool is_dolby_vision_stb_mode(void)
{
return 0;
}
#endif
static struct amvideocap_req *capture_frame_req;
static struct video_prot_s video_prot;
static u32 video_angle;
@@ -971,8 +986,10 @@ static inline void video_vf_put(struct vframe_s *vf)
if (vfp && vf && atomic_dec_and_test(&vf->use_cnt)) {
vf_put(vf, RECEIVER_NAME);
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (is_dolby_vision_enable())
dolby_vision_vf_put(vf);
#endif
video_notify_flag |= VIDEO_NOTIFY_PROVIDER_PUT;
}
}
@@ -2603,6 +2620,7 @@ static void viu_set_dcu(struct vpp_frame_par_s *frame_par, struct vframe_s *vf)
/* TODO: afbc setting only cover 420 for now */
#ifdef TV_REVERSE
if (reverse) {
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (is_meson_txlx_package_962X()
&& !is_dolby_vision_stb_mode()
&& is_dolby_vision_on())
@@ -2616,6 +2634,7 @@ static void viu_set_dcu(struct vpp_frame_par_s *frame_par, struct vframe_s *vf)
(0x8 << VFORMATTER_PHASE_BIT) |
VFORMATTER_EN);
else
#endif
VSYNC_WR_MPEG_REG(AFBC_VD_CFMT_CTRL,
HFORMATTER_REPEAT |
(0xc << VFORMATTER_INIPHASE_BIT) |
@@ -2627,6 +2646,7 @@ static void viu_set_dcu(struct vpp_frame_par_s *frame_par, struct vframe_s *vf)
} else
#endif
{
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (is_meson_txlx_package_962X()
&& !is_dolby_vision_stb_mode()
&& is_dolby_vision_on())
@@ -2640,6 +2660,7 @@ static void viu_set_dcu(struct vpp_frame_par_s *frame_par, struct vframe_s *vf)
(0x8 << VFORMATTER_PHASE_BIT) |
VFORMATTER_EN);
else
#endif
VSYNC_WR_MPEG_REG(AFBC_VD_CFMT_CTRL,
HFORMATTER_REPEAT |
(0xc << VFORMATTER_INIPHASE_BIT) |
@@ -2929,7 +2950,7 @@ static void viu_set_dcu(struct vpp_frame_par_s *frame_par, struct vframe_s *vf)
(((type & VIDTYPE_VIU_422) ? 0x10 : 0x08)
<< VFORMATTER_PHASE_BIT) | VFORMATTER_EN);
}
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if ((is_meson_txlx_cpu()
|| is_meson_g12a())
&& is_dolby_vision_on()
@@ -2939,7 +2960,7 @@ static void viu_set_dcu(struct vpp_frame_par_s *frame_par, struct vframe_s *vf)
VSYNC_WR_MPEG_REG_BITS(
VIU_VD1_FMT_CTRL + cur_dev->viu_off,
1, 29, 1);
#endif
/* LOOP/SKIP pattern */
pat = vpat[frame_par->vscale_skip_count];
@@ -3152,6 +3173,7 @@ static void vd2_set_dcu(struct vpp_frame_par_s *frame_par, struct vframe_s *vf)
/* TODO: afbc setting only cover 420 for now */
#ifdef TV_REVERSE
if (reverse) {
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (is_meson_txlx_package_962X()
&& !is_dolby_vision_stb_mode()
&& is_dolby_vision_on()) {
@@ -3165,6 +3187,7 @@ static void vd2_set_dcu(struct vpp_frame_par_s *frame_par, struct vframe_s *vf)
(0x8 << VFORMATTER_PHASE_BIT) |
VFORMATTER_EN);
} else
#endif
VSYNC_WR_MPEG_REG(VD2_AFBC_VD_CFMT_CTRL,
(is_dolby_vision_on() ?
HFORMATTER_REPEAT :
@@ -3178,6 +3201,7 @@ static void vd2_set_dcu(struct vpp_frame_par_s *frame_par, struct vframe_s *vf)
VFORMATTER_EN);
} else {
#endif
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (is_meson_txlx_package_962X()
&& !is_dolby_vision_stb_mode()
&& is_dolby_vision_on()) {
@@ -3191,6 +3215,7 @@ static void vd2_set_dcu(struct vpp_frame_par_s *frame_par, struct vframe_s *vf)
(0x8 << VFORMATTER_PHASE_BIT) |
VFORMATTER_EN);
} else
#endif
VSYNC_WR_MPEG_REG(VD2_AFBC_VD_CFMT_CTRL,
(is_dolby_vision_on() ?
HFORMATTER_REPEAT :
@@ -3390,7 +3415,7 @@ static void vd2_set_dcu(struct vpp_frame_par_s *frame_par, struct vframe_s *vf)
/*is_dolby_vision_on()*/0);
}
}
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if ((is_meson_txlx_cpu()
|| is_meson_g12a())
&& is_dolby_vision_on()
@@ -3400,6 +3425,7 @@ static void vd2_set_dcu(struct vpp_frame_par_s *frame_par, struct vframe_s *vf)
VSYNC_WR_MPEG_REG_BITS(
VIU_VD2_FMT_CTRL + cur_dev->viu_off,
1, 29, 1);
#endif
/* LOOP/SKIP pattern */
pat = vpat[frame_par->vscale_skip_count];
@@ -3992,7 +4018,7 @@ static inline bool video_vf_dirty_put(struct vframe_s *vf)
return true;
}
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
struct vframe_s *dolby_vision_toggle_frame(struct vframe_s *vf)
{
struct vframe_s *toggle_vf = NULL;
@@ -4075,6 +4101,7 @@ static int dolby_vision_need_wait(void)
return 1;
return 0;
}
#endif
/* patch for 4k2k bandwidth issue, skiw mali and vpu mif */
static void dmc_adjust_for_mali_vpu(unsigned int width,
unsigned int height, bool force_adjust)
@@ -4469,10 +4496,11 @@ static irqreturn_t vsync_isr_in(int irq, void *dev_id)
enable_rdma_log_count--;
}
#endif
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
/* check video frame before VECM process */
if (is_dolby_vision_enable() && vf)
dolby_vision_check_hdr10(vf);
#endif
#ifdef CONFIG_TVIN_VDIN
/* patch for m8 4k2k wifidisplay bandwidth bottleneck */
if (get_cpu_type() == MESON_CPU_MAJOR_ID_M8) {
@@ -4700,9 +4728,11 @@ static irqreturn_t vsync_isr_in(int irq, void *dev_id)
0) == 1)
break;
#endif
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (is_dolby_vision_enable()
&& dolby_vision_need_wait())
break;
#endif
/*
*two special case:
*case1:4k display case,input buffer not enough &
@@ -4742,10 +4772,13 @@ static irqreturn_t vsync_isr_in(int irq, void *dev_id)
}
vsync_toggle_frame(vf);
toggle_frame = vf;
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (is_dolby_vision_enable()) {
toggle_vf = dolby_vision_toggle_frame(vf);
video_pause_global = 0;
} else {
} else
#endif
{
cur_dispbuf2 = NULL;
video_pause_global = 2;
pause_vf = NULL;
@@ -4772,9 +4805,11 @@ static irqreturn_t vsync_isr_in(int irq, void *dev_id)
vf = video_vf_peek();
if (!vf)
next_peek_underflow++;
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (for_dolby_vision_certification()
&& toggle_vf)
break;
#endif
if (debug_flag & DEBUG_FLAG_TOGGLE_FRAME_PER_VSYNC)
break;
video_get_vf_cnt++;
@@ -4803,9 +4838,11 @@ static irqreturn_t vsync_isr_in(int irq, void *dev_id)
"sys.time = 0x%x, video time = 0x%x\n",
timestamp_pcrscr_get(),
timestamp_vpts_get());
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (is_dolby_vision_enable()
&& dolby_vision_need_wait())
break;
#endif
#if defined(CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_VECM)
refresh_on_vs(vf);
if (amvecm_on_vs(
@@ -4825,10 +4862,12 @@ static irqreturn_t vsync_isr_in(int irq, void *dev_id)
break;
vsync_toggle_frame(vf);
toggle_frame = vf;
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (is_dolby_vision_enable())
toggle_vf =
dolby_vision_toggle_frame(vf);
else
#endif
cur_dispbuf2 = NULL;
frame_repeat_count = 0;
@@ -4911,7 +4950,7 @@ SET_FILTER:
cur_frame_par = next_frame_par;
frame_par_di_set = 1;
}
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (is_dolby_vision_enable()) {
u32 frame_size = 0, h_size, v_size;
/* force toggle when keeping frame after playing */
@@ -4963,6 +5002,7 @@ SET_FILTER:
dolby_vision_process(toggle_vf, frame_size);
dolby_vision_update_setting();
}
#endif
if ((platform_type == 1) || (platform_type == 0)) {
if (mode_3d_changed) {
mode_3d_changed = 0;
@@ -5269,11 +5309,14 @@ SET_FILTER:
/* vpp filters */
/* SET_MPEG_REG_MASK(VPP_SC_MISC + cur_dev->vpp_off, */
/* VPP_SC_TOP_EN | VPP_SC_VERT_EN | VPP_SC_HORZ_EN); */
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (for_dolby_vision_certification()) {
/* turn off PPS for Dolby Vision certification */
VSYNC_WR_MPEG_REG_BITS(VPP_SC_MISC + cur_dev->vpp_off,
0, VPP_SC_TOP_EN_BIT, VPP_SC_TOP_EN_WID);
} else {
} else
#endif
{
VSYNC_WR_MPEG_REG(VPP_SC_MISC + cur_dev->vpp_off,
READ_VCBUS_REG(VPP_SC_MISC +
cur_dev->vpp_off) |
@@ -8886,12 +8929,6 @@ static void do_vpu_delay_work(struct work_struct *work)
unsigned int r;
#if DEBUG_TMP
if (vpu_delay_work_flag & VPU_UPDATE_DOLBY_VISION) {
vpu_delay_work_flag &= ~VPU_UPDATE_DOLBY_VISION;
dolby_vision_update_setting();
if (!vpu_delay_work_flag)
return;
}
if (vpu_delay_work_flag & VPU_VIDEO_LAYER1_CHANGED) {
vpu_delay_work_flag &= ~VPU_VIDEO_LAYER1_CHANGED;

4
drivers/amlogic/media/vin/tvin/vdin/vdin_ctl.c
View File

@@ -475,9 +475,11 @@ void vdin_get_format_convert(struct vdin_dev_s *devp)
break;
}
}
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if ((devp->dv.dolby_input & (1 << devp->index)) ||
(devp->dv.dv_flag && is_dolby_vision_enable()))
format_convert = VDIN_FORMAT_CONVERT_YUV_YUV444;
#endif
devp->format_convert = format_convert;
}
@@ -1488,10 +1490,12 @@ void vdin_set_matrix(struct vdin_dev_s *devp)
devp->prop.color_fmt_range,
devp->prop.vdin_hdr_Flag,
devp->color_range_mode);
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if ((devp->dv.dolby_input & (1 << devp->index)) ||
(devp->dv.dv_flag && is_dolby_vision_enable()))
wr_bits(offset, VDIN_MATRIX_CTRL, 0,
VDIN_MATRIX_EN_BIT, VDIN_MATRIX_EN_WID);
#endif
} else {
format_convert_matrix0 = vdin_get_format_convert_matrix0(devp);
format_convert_matrix1 = vdin_get_format_convert_matrix1(devp);

15
drivers/amlogic/media/vin/tvin/vdin/vdin_drv.c
View File

@@ -486,6 +486,7 @@ void vdin_start_dec(struct vdin_dev_s *devp)
devp->vfp->size = devp->canvas_max_num;
vf_pool_init(devp->vfp, devp->vfp->size);
vdin_vf_init(devp);
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if ((devp->dv.dolby_input & (1 << devp->index)) ||
(devp->dv.dv_flag && is_dolby_vision_enable())) {
/* config dolby mem base */
@@ -495,7 +496,7 @@ void vdin_start_dec(struct vdin_dev_s *devp)
if (vdin_dbg_en)
pr_info("vdin start dec dv input config\n");
}
#endif
devp->abnormal_cnt = 0;
devp->last_wr_vfe = NULL;
irq_max_count = 0;
@@ -527,17 +528,21 @@ void vdin_start_dec(struct vdin_dev_s *devp)
if (devp->rdma_enable && devp->rdma_handle > 0)
devp->flags |= VDIN_FLAG_RDMA_ENABLE;
#endif
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
/*only for vdin0;vdin1 used for debug*/
if ((devp->dv.dolby_input & (1 << 0)) ||
(devp->dv.dv_flag && is_dolby_vision_enable()))
vf_reg_provider(&devp->dv.vprov_dv);
else
#endif
vf_reg_provider(&devp->vprov);
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if ((devp->dv.dolby_input & (1 << devp->index)) ||
(devp->dv.dv_flag && is_dolby_vision_enable()))
vf_notify_receiver("dv_vdin",
VFRAME_EVENT_PROVIDER_START, NULL);
else
#endif
vf_notify_receiver(devp->name,
VFRAME_EVENT_PROVIDER_START, NULL);
if ((devp->parm.port != TVIN_PORT_VIU1) ||
@@ -604,7 +609,7 @@ void vdin_stop_dec(struct vdin_dev_s *devp)
/* reset default canvas */
vdin_set_def_wr_canvas(devp);
#if 1/*def CONFIG_AM_HDMIIN_DV*/
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (((devp->dv.dolby_input & (1 << devp->index)) ||
is_dolby_vision_enable()) &&
(devp->dv.dv_config == true))
@@ -1230,12 +1235,14 @@ irqreturn_t vdin_isr(int irq, void *dev_id)
vdin_vf_disp_mode_update(devp->last_wr_vfe, devp->vfp);
devp->last_wr_vfe = NULL;
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (((devp->dv.dolby_input & (1 << devp->index)) ||
(devp->dv.dv_flag && is_dolby_vision_enable())) &&
(devp->dv.dv_config == true))
vf_notify_receiver("dv_vdin",
VFRAME_EVENT_PROVIDER_VFRAME_READY, NULL);
else
#endif
vf_notify_receiver(devp->name,
VFRAME_EVENT_PROVIDER_VFRAME_READY, NULL);
}
@@ -1357,12 +1364,14 @@ irqreturn_t vdin_isr(int irq, void *dev_id)
vdin_drop_cnt++;
goto irq_handled;
}
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (((devp->dv.dolby_input & (1 << devp->index)) ||
(devp->dv.dv_flag && is_dolby_vision_enable())) &&
(devp->dv.dv_config == true))
vdin2nr = vf_notify_receiver("dv_vdin",
VFRAME_EVENT_PROVIDER_QUREY_VDIN2NR, NULL);
else
#endif
vdin2nr = vf_notify_receiver(devp->name,
VFRAME_EVENT_PROVIDER_QUREY_VDIN2NR, NULL);
/*if vdin-nr,di must get
@@ -1468,12 +1477,14 @@ irqreturn_t vdin_isr(int irq, void *dev_id)
next_wr_vfe->vf.ready_jiffies64 = jiffies_64;
if (!(devp->flags&VDIN_FLAG_RDMA_ENABLE) || (devp->game_mode == true)) {
#ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION
if (((devp->dv.dolby_input & (1 << devp->index)) ||
(devp->dv.dv_flag && is_dolby_vision_enable())) &&
(devp->dv.dv_config == true))
vf_notify_receiver("dv_vdin",
VFRAME_EVENT_PROVIDER_VFRAME_READY, NULL);
else
#endif
vf_notify_receiver(devp->name,
VFRAME_EVENT_PROVIDER_VFRAME_READY, NULL);
}