From 5ef94388220930fa68ce22782de09b12b30053fd Mon Sep 17 00:00:00 2001 From: kele bai Date: Tue, 24 Apr 2018 13:21:46 +0800 Subject: [PATCH] di: fix if2 disable issue PD#164232: di: fix if2 disable issue Change-Id: I0976e22738045c97e8ff1c9bd13d4e1b301b6eac Signed-off-by: kele bai --- drivers/amlogic/media/deinterlace/deinterlace_hw.c | 11 +++-------- drivers/amlogic/media/deinterlace/nr_downscale.c | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/amlogic/media/deinterlace/deinterlace_hw.c b/drivers/amlogic/media/deinterlace/deinterlace_hw.c index 2b11a18b6105..3acfe8b20658 100644 --- a/drivers/amlogic/media/deinterlace/deinterlace_hw.c +++ b/drivers/amlogic/media/deinterlace/deinterlace_hw.c @@ -2333,14 +2333,9 @@ void enable_di_post_2( } set_di_if1_mif(di_buf1_mif, di_vpp_en, hold_line, vskip_cnt); - if (cpu_after_eq(MESON_CPU_MAJOR_ID_TXL)) { - if (blend_en) { - set_di_if2_mif(di_buf2_mif, - di_vpp_en, hold_line, vskip_cnt); - } else { - DI_VSYNC_WR_MPEG_REG(DI_IF2_GEN_REG, 0); - } - } + if (cpu_after_eq(MESON_CPU_MAJOR_ID_TXL)) + set_di_if2_mif(di_buf2_mif, + di_vpp_en, hold_line, vskip_cnt); /* motion for current display field. */ if (cpu_after_eq(MESON_CPU_MAJOR_ID_G12A)) set_post_mtnrd_mif_g12(di_mtnprd_mif); diff --git a/drivers/amlogic/media/deinterlace/nr_downscale.c b/drivers/amlogic/media/deinterlace/nr_downscale.c index 5008baf449fa..66baf44ba6a0 100644 --- a/drivers/amlogic/media/deinterlace/nr_downscale.c +++ b/drivers/amlogic/media/deinterlace/nr_downscale.c @@ -96,7 +96,7 @@ void nr_ds_buf_uninit(unsigned int cma_flag, struct device *dev) nrds_dev.nrds_addr = 0; nrds_dev.nrds_pages = NULL; } else - pr_err("DI: release nr ds mem error.\n"); + pr_info("DI: no release nr ds mem.\n"); } for (i = 0; i < NR_DS_BUF_NUM; i++) nrds_dev.buf[i] = 0; -- 2.34.1