From 8e075a7ced85bd8a83a9471fc652ac94ab25da37 Mon Sep 17 00:00:00 2001 From: "wenfeng.guo" Date: Tue, 20 Nov 2018 19:38:43 +0800 Subject: [PATCH] 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 Conflicts: drivers/amlogic/media/deinterlace/deinterlace.c drivers/amlogic/media/deinterlace/deinterlace_hw.c drivers/amlogic/media/deinterlace/deinterlace_hw.h --- drivers/amlogic/media/deinterlace/deinterlace_hw.c | 5 ----- drivers/amlogic/media/deinterlace/deinterlace_hw.h | 13 ------------- 2 files changed, 18 deletions(-) diff --git a/drivers/amlogic/media/deinterlace/deinterlace_hw.c b/drivers/amlogic/media/deinterlace/deinterlace_hw.c index 4b0a0b00caa8..3e0437ad754c 100644 --- a/drivers/amlogic/media/deinterlace/deinterlace_hw.c +++ b/drivers/amlogic/media/deinterlace/deinterlace_hw.c @@ -330,11 +330,6 @@ void calc_lmv_base_mcinfo(unsigned int vf_height, unsigned long mcinfo_adr, if (!lmv_lock_win_en) return; - if (!cpu_after_eq(MESON_CPU_MAJOR_ID_G12A)) { - pr_debug("%s: only support G12A and after chips.\n", __func__); - return; - } - tmp = di_vmap(mcinfo_adr, mcinfo_size, &bflg_vmap); if (tmp == NULL) { di_print("err:di_vmap failed\n"); diff --git a/drivers/amlogic/media/deinterlace/deinterlace_hw.h b/drivers/amlogic/media/deinterlace/deinterlace_hw.h index 17622be59b4a..e18198410946 100644 --- a/drivers/amlogic/media/deinterlace/deinterlace_hw.h +++ b/drivers/amlogic/media/deinterlace/deinterlace_hw.h @@ -187,18 +187,5 @@ extern u8 *di_vmap(ulong addr, u32 size, bool *bflg); extern void di_unmap_phyaddr(u8 *vaddr); extern int di_print(const char *fmt, ...); -#define DI_MC_SW_OTHER (1<<0) -#define DI_MC_SW_REG (1<<1) -//#define DI_MC_SW_POST (1<<2) -#define DI_MC_SW_IC (1<<2) - -#define DI_MC_SW_ON_MASK (DI_MC_SW_REG | DI_MC_SW_OTHER | DI_MC_SW_IC) - -extern void di_patch_post_update_mc(void); -extern void di_patch_post_update_mc_sw(unsigned int cmd, bool on); - -extern void di_rst_protect(bool on); -extern void di_pre_nr_wr_done_sel(bool on); -extern void di_arb_sw(bool on); #endif