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

deinterlace: fix CMA layout adaptation di_cma_reserved [1/1]

Browse Source 
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 <wenfeng.guo@amlogic.com>

Conflicts:
	drivers/amlogic/media/deinterlace/deinterlace.c
	drivers/amlogic/media/deinterlace/deinterlace_hw.c
	drivers/amlogic/media/deinterlace/deinterlace_hw.h
This commit is contained in:
wenfeng.guo
2018-11-20 19:38:43 +08:00
committed by Dongjin Kim
parent 32376b037b
commit 8e075a7ced
2 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/amlogic/media/deinterlace/deinterlace_hw.c
View File

@@ -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");

13
drivers/amlogic/media/deinterlace/deinterlace_hw.h
View File

@@ -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