media_module: optimize frame check [1/1]

PD#SWPL-4342

Problem:
crc32 code optimize.

Solution:
1. crash when check crc32 in single mode.
2. no clear frame_check when repeat play for debug mode;
3. block run ready when crc32 error for debug mode;
4. fix some bugs and optimize code.

Verify:
x301

Change-Id: Ie01860f70c74385540fa6022e99d2affcabfa19a
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>

drivers/amlogic/media_modules/frame_provider/decoder/avs/avs.c

@@ -581,7 +581,7 @@ static void vavs_isr(void)
 				decoder_bmmu_box_get_mem_handle(
 					mm_blk_handle,
 					buffer_index);
-
+			decoder_do_frame_check(NULL, vf);
 			kfifo_put(&display_q,
 					  (const struct vframe_s *)vf);
 			vf_notify_receiver(PROVIDER_NAME,
@@ -717,6 +717,7 @@ static void vavs_isr(void)
 				decoder_bmmu_box_get_mem_handle(
 					mm_blk_handle,
 					buffer_index);
+			decoder_do_frame_check(NULL, vf);
 			kfifo_put(&display_q,
 					  (const struct vframe_s *)vf);
 			vf_notify_receiver(PROVIDER_NAME,
@@ -849,6 +850,7 @@ static int vavs_canvas_init(void)
 	u32 decbuf_size, decbuf_y_size, decbuf_uv_size;
 	unsigned long buf_start;
 	int need_alloc_buf_num;
+	u32 endian;
 
 	vf_buf_num_used = vf_buf_num;
 	if (buf_size <= 0x00400000) {
@@ -899,37 +901,40 @@ static int vavs_canvas_init(void)
 			continue;
 		}
 #endif
-
+		if (vdec->canvas_mode == CANVAS_BLKMODE_LINEAR)
+			endian = 7;
+		else
+			endian = 0;
 #ifdef NV21
-			canvas_config(canvas_base + canvas_num * i + 0,
+			canvas_config_ex(canvas_base + canvas_num * i + 0,
 					buf_start,
 					canvas_width, canvas_height,
 					CANVAS_ADDR_NOWRAP,
-					CANVAS_BLKMODE_32X32);
-			canvas_config(canvas_base + canvas_num * i + 1,
+					vdec->canvas_mode, endian);
+			canvas_config_ex(canvas_base + canvas_num * i + 1,
 					buf_start +
 					decbuf_y_size, canvas_width,
 					canvas_height / 2,
 					CANVAS_ADDR_NOWRAP,
-					CANVAS_BLKMODE_32X32);
+					vdec->canvas_mode, endian);
 #else
-			canvas_config(canvas_num * i + 0,
+			canvas_config_ex(canvas_num * i + 0,
 					buf_start,
 					canvas_width, canvas_height,
 					CANVAS_ADDR_NOWRAP,
-					CANVAS_BLKMODE_32X32);
-			canvas_config(canvas_num * i + 1,
+					vdec->canvas_mode, endian);
+			canvas_config_ex(canvas_num * i + 1,
 					buf_start +
 					decbuf_y_size, canvas_width / 2,
 					canvas_height / 2,
 					CANVAS_ADDR_NOWRAP,
-					CANVAS_BLKMODE_32X32);
-			canvas_config(canvas_num * i + 2,
+					vdec->canvas_mode, endian);
+			canvas_config_ex(canvas_num * i + 2,
 					buf_start +
 					decbuf_y_size + decbuf_uv_size,
 					canvas_width / 2, canvas_height / 2,
 					CANVAS_ADDR_NOWRAP,
-					CANVAS_BLKMODE_32X32);
+					vdec->canvas_mode, endian);
 #endif
 			if (debug_flag & AVS_DEBUG_PRINT) {
 				pr_info("canvas config %d, addr %p\n", i,
@@ -1690,6 +1695,7 @@ static int amvdec_avs_probe(struct platform_device *pdev)
 	}
 
 	INIT_WORK(&set_clk_work, avs_set_clk);
+	vdec = pdata;
 	if (vavs_init() < 0) {
 		pr_info("amvdec_avs init failed.\n");
 		kfree(gvs);
@@ -1697,7 +1703,6 @@ static int amvdec_avs_probe(struct platform_device *pdev)
 		pdata->dec_status = NULL;
 		return -ENODEV;
 	}
-	vdec = pdata;
 
 	INIT_WORK(&fatal_error_wd_work, vavs_fatal_error_handler);
 	atomic_set(&error_handler_run, 0);

drivers/amlogic/media_modules/frame_provider/decoder/mpeg12/vmpeg12_multi.c

@@ -225,6 +225,7 @@ struct vdec_mpeg12_hw_s {
 	u32 buffer_not_ready;
 	int frameinfo_enable;
 	struct firmware_s *fw;
+	u32 canvas_mode;
 };
 static void vmpeg12_local_init(struct vdec_mpeg12_hw_s *hw);
 static int vmpeg12_hw_ctx_restore(struct vdec_mpeg12_hw_s *hw);
@@ -701,6 +702,7 @@ static irqreturn_t vmpeg12_isr_thread_fn(struct vdec_s *vdec, int irq)
 				debug_print(DECODE_ID(hw), PRINT_FLAG_TIMEINFO,
 							"cpts=%d,pts64=%lld\n",
 				vf->pts, vf->pts_us64);
+				decoder_do_frame_check(hw_to_vdec(hw), vf);
 				kfifo_put(&hw->display_q,
 				(const struct vframe_s *)vf);
 				hw->frame_num++;
@@ -766,6 +768,7 @@ static irqreturn_t vmpeg12_isr_thread_fn(struct vdec_s *vdec, int irq)
 			"cpts0=%d,pts64=%lld,dur=%d, index %d , use %d\n",
 				vf->pts, vf->pts_us64, vf->duration,
 				vf->index, hw->vfbuf_use[index]);
+				decoder_do_frame_check(hw_to_vdec(hw), vf);
 				kfifo_put(&hw->display_q,
 				(const struct vframe_s *)vf);
 				hw->frame_num++;
@@ -1190,7 +1193,9 @@ static void vmpeg12_canvas_init(struct vdec_mpeg12_hw_s *hw)
 			hw->canvas_config[i][0].height =
 			canvas_height;
 			hw->canvas_config[i][0].block_mode =
-			CANVAS_BLKMODE_32X32;
+				hw->canvas_mode;
+			hw->canvas_config[i][0].endian =
+				(hw->canvas_mode == CANVAS_BLKMODE_LINEAR)?7:0;
 
 			canvas_config_config(canvas_y(canvas),
 			&hw->canvas_config[i][0]);
@@ -1202,7 +1207,9 @@ static void vmpeg12_canvas_init(struct vdec_mpeg12_hw_s *hw)
 			hw->canvas_config[i][1].height =
 			canvas_height / 2;
 			hw->canvas_config[i][1].block_mode =
-			CANVAS_BLKMODE_32X32;
+				hw->canvas_mode;
+			hw->canvas_config[i][0].endian =
+				(hw->canvas_mode == CANVAS_BLKMODE_LINEAR)?7:0;
 
 			canvas_config_config(canvas_u(canvas),
 			&hw->canvas_config[i][1]);
@@ -1805,7 +1812,7 @@ static int ammvdec_mpeg12_probe(struct platform_device *pdev)
 		&vf_provider_ops, pdata);
 
 	platform_set_drvdata(pdev, pdata);
-
+	hw->canvas_mode = pdata->canvas_mode;
 	hw->platform_dev = pdev;
 
 	if (pdata->sys_info)

drivers/amlogic/media_modules/frame_provider/decoder/utils/frame_check.c

@@ -39,6 +39,9 @@
 #include "vdec.h"
 #include "frame_check.h"
 #include "amlogic_fbc_hook.h"
+#include <linux/highmem.h>
+#include <linux/page-flags.h>
+#include "../../../common/chips/decoder_cpu_ver_info.h"
 
 
 #define FC_ERROR	0x0
@@ -46,6 +49,8 @@
 #define FC_YUV_DEBUG	0x01
 #define FC_CRC_DEBUG	0x02
 #define FC_TST_DEBUG	0x80
+#define FC_ERR_CRC_BLOCK_MODE	0x10
+#define FC_CHECK_CRC_LOOP_MODE	0x20
 
 #define YUV_MASK	0x01
 #define CRC_MASK	0x02
@@ -71,26 +76,29 @@ static unsigned int size_yuv_buf = (YUV_DEF_SIZE * YUV_DEF_NUM);
 #define YUV_PATH  "/data/tmp/"
 static char comp_crc[128] = "name";
 
+static struct vdec_s *single_mode_vdec = NULL;
 
-module_param_string(comp_crc, comp_crc, 128, 0664);
-MODULE_PARM_DESC(comp_crc, "\n crc_filename\n");
+static unsigned int yuv_enable, check_enable;
+static unsigned int yuv_start[MAX_INSTANCE_MUN];
+static unsigned int yuv_num[MAX_INSTANCE_MUN];
 
-module_param(fc_debug, uint, 0664);
-MODULE_PARM_DESC(fc_debug, "\n frame check debug\n");
 
-module_param(size_yuv_buf, uint, 0664);
-MODULE_PARM_DESC(size_yuv_buf, "\n size_yuv_buf\n");
-
-static __inline void set_enable(struct pic_check_mgr_t *p, int mask)
+static inline void set_enable(struct pic_check_mgr_t *p, int mask)
 {
 	p->enable |= mask;
 }
 
-static __inline void set_disable(struct pic_check_mgr_t *p, int mask)
+static inline void set_disable(struct pic_check_mgr_t *p, int mask)
 {
 	p->enable &= (~mask);
 }
 
+static inline void check_schedule(struct pic_check_mgr_t *mgr)
+{
+	if (atomic_read(&mgr->work_inited))
+		vdec_schedule_work(&mgr->frame_check_work);
+}
+
 static int get_frame_size(struct pic_check_mgr_t *pic,
 	struct vframe_s *vf)
 {
@@ -199,8 +207,10 @@ static char *fget_crc_str(char *buf,
 				break;
 		}
 		*cs = '\0';
-		if ((c == 0) && (cs == buf))
+		if ((c == 0) && (cs == buf)) {
+			set_fs(old_fs);
 			return NULL;
+		}
 		ret = sscanf(buf, "%08u: %8x %8x", &index, &crc1, &crc2);
 		dbg_print(FC_CRC_DEBUG, "%s, index = %d, cmp = %d\n",
 			__func__, index, fc->cmp_crc_cnt);
@@ -221,7 +231,7 @@ static struct file* file_open(int mode, const char *str, ...)
 	va_start(args, str);
 	vsnprintf(file, sizeof(file), str, args);
 
-	fp = filp_open(file, mode, 0);
+	fp = filp_open(file, mode, (mode&O_CREAT)?0666:0);
 	if (IS_ERR(fp)) {
 		fp = NULL;
 		dbg_print(FC_ERROR, "open %s failed\n", file);
@@ -327,38 +337,65 @@ static void do_check_work(struct work_struct *work)
 	write_crc_work(mgr);
 }
 
-static void check_schedule(struct pic_check_mgr_t *mgr)
-{
-	if (atomic_read(&mgr->work_inited))
-		vdec_schedule_work(&mgr->frame_check_work);
-}
-
 static int memcpy_phy_to_virt(char *to_virt,
 	ulong phy_from, unsigned int size)
 {
 	void *vaddr = NULL;
 	unsigned int tmp_size = 0;
 
-	while (size > 0) {
-		if (size >= VMAP_STRIDE_SIZE) {
-			vaddr = (void *)codec_mm_vmap(phy_from, VMAP_STRIDE_SIZE);
-			tmp_size = VMAP_STRIDE_SIZE;
-			phy_from += VMAP_STRIDE_SIZE;
-			size -= VMAP_STRIDE_SIZE;
-		} else {
-			vaddr = (void *)codec_mm_vmap(phy_from, size);
-			tmp_size = size;
-			size = 0;
-		}
-		if (vaddr == NULL) {
-			dbg_print(FC_YUV_DEBUG, "%s: codec_mm_vmap failed phy: 0x%x\n",
-				__func__, (unsigned int)phy_from);
-			return -1;
-		}
-		memcpy(to_virt, vaddr, tmp_size);
-		to_virt += tmp_size;
+	if (single_mode_vdec != NULL) {
+		unsigned int offset = phy_from & (~PAGE_MASK);
+		while (size > 0) {
+			if (offset + size >= PAGE_SIZE) {
+				vaddr = kmap_atomic(phys_to_page(phy_from));
+				tmp_size = (PAGE_SIZE - offset);
+				phy_from += tmp_size;
+				size -= tmp_size;
+				vaddr += offset;
+			} else {
+				vaddr = kmap_atomic(phys_to_page(phy_from));
+				vaddr += offset;
+				tmp_size = size;
+				size = 0;
+			}
+			if (vaddr == NULL) {
+				dbg_print(FC_CRC_DEBUG, "%s: kmap_atomic failed phy: 0x%x\n",
+					__func__, (unsigned int)phy_from);
+				return -1;
+			}
+			/*
+			codec_mm_dma_flush(vaddr,
+				tmp_size, DMA_FROM_DEVICE);
+			*/
+			memcpy(to_virt, vaddr, tmp_size);
 
-		codec_mm_unmap_phyaddr(vaddr);
+			kunmap_atomic(vaddr - offset);
+			offset = 0;
+		}
+	} else {
+		while (size > 0) {
+			if (size >= VMAP_STRIDE_SIZE) {
+				vaddr = codec_mm_vmap(phy_from, VMAP_STRIDE_SIZE);
+				tmp_size = VMAP_STRIDE_SIZE;
+				phy_from += VMAP_STRIDE_SIZE;
+				size -= VMAP_STRIDE_SIZE;
+			} else {
+				vaddr = codec_mm_vmap(phy_from, size);
+				tmp_size = size;
+				size = 0;
+			}
+			if (vaddr == NULL) {
+				dbg_print(FC_YUV_DEBUG, "%s: codec_mm_vmap failed phy: 0x%x\n",
+					__func__, (unsigned int)phy_from);
+				return -1;
+			}
+			codec_mm_dma_flush(vaddr,
+				tmp_size, DMA_FROM_DEVICE);
+			memcpy(to_virt, vaddr, tmp_size);
+			to_virt += tmp_size;
+
+			codec_mm_unmap_phyaddr(vaddr);
+		}
 	}
 	return 0;
 }
@@ -439,8 +476,7 @@ static int do_yuv_dump(struct pic_check_mgr_t *mgr, struct vframe_s *vf)
 		}
 	}
 	dump->dump_cnt++;
-	dbg_print(0,
-		"----->>dump frame num: %d, dump %dst, size %x\n",
+	dbg_print(0, "----->dump frame num: %d, dump %dst, size %x\n",
 		mgr->frame_cnt, dump->dump_cnt, mgr->size_pic);
 
 	if (dump->dump_cnt >= dump->num)
@@ -453,13 +489,18 @@ static int crc_store(struct pic_check_mgr_t *mgr, struct vframe_s *vf,
 	int crc_y, int crc_uv)
 {
 	int ret = 0;
-	char *crc_addr;
+	char *crc_addr = NULL;
 	int comp_frame = 0, comp_crc_y, comp_crc_uv;
 	struct pic_check_t *check = &mgr->pic_check;
 
 	if (kfifo_get(&check->new_chk_q, &crc_addr) == 0) {
 		dbg_print(0, "%08d: %08x %08x\n",
 			mgr->frame_cnt, crc_y, crc_uv);
+		if (check->check_fp) {
+			dbg_print(0, "crc32 dropped\n");
+		} else {
+			dbg_print(0, "no opened file to write crc32\n");
+		}
 		return -1;
 	}
 	if (check->cmp_crc_cnt > mgr->frame_cnt) {
@@ -469,22 +510,26 @@ static int crc_store(struct pic_check_mgr_t *mgr, struct vframe_s *vf,
 		dbg_print(0, "%08d: %08x %08x <--> %08d: %08x %08x\n",
 			mgr->frame_cnt, crc_y, crc_uv,
 			comp_frame, comp_crc_y, comp_crc_uv);
-		/*
-		if ((mgr->frame_cnt % 100) == 0)
-			comp_crc_uv = mgr->frame_cnt;
-		*/
+
 		if (comp_frame == mgr->frame_cnt) {
 			if ((comp_crc_y != crc_y) || (crc_uv != comp_crc_uv)) {
 					mgr->pic_dump.start = 0;
 					mgr->pic_dump.num++;
-					dbg_print(0, "\n\nError: %08d, %08x %08x != %08x %08x\n\n",
+					dbg_print(0, "\n\nError: %08d: %08x %08x != %08x %08x\n\n",
 						mgr->frame_cnt, crc_y, crc_uv, comp_crc_y, comp_crc_uv);
 					do_yuv_dump(mgr, vf);
+					if (fc_debug & FC_ERR_CRC_BLOCK_MODE)
+						mgr->err_crc_block = 1;
 			}
+		} else {
+			dbg_print(0, "frame num error: frame_cnt(%d) frame_comp(%d)\n",
+				mgr->frame_cnt, comp_frame);
 		}
-    }
+	} else {
+		dbg_print(0, "%08d: %08x %08x\n", mgr->frame_cnt, crc_y, crc_uv);
+	}
 
-	if (check->check_fp) {
+	if ((check->check_fp) && (crc_addr != NULL)) {
 		ret = snprintf(crc_addr, SIZE_CRC,
 			"%08d: %08x %08x\n", mgr->frame_cnt, crc_y, crc_uv);
 
@@ -495,6 +540,7 @@ static int crc_store(struct pic_check_mgr_t *mgr, struct vframe_s *vf,
 	return ret;
 }
 
+
 static int crc32_vmap_le(unsigned int *crc32,
 	ulong phyaddr, unsigned int size)
 {
@@ -502,25 +548,60 @@ static int crc32_vmap_le(unsigned int *crc32,
 	unsigned int crc = 0;
 	unsigned int tmp_size = 0;
 
-	while (size > 0) {
-		if (size >= VMAP_STRIDE_SIZE) {
-			vaddr = (void *)codec_mm_vmap(phyaddr, VMAP_STRIDE_SIZE);
-			tmp_size = VMAP_STRIDE_SIZE;
-			phyaddr += VMAP_STRIDE_SIZE;
-			size -= VMAP_STRIDE_SIZE;
-		} else {
-			vaddr = (void *)codec_mm_vmap(phyaddr, size);
-			tmp_size = size;
-			size = 0;
-		}
-		if (vaddr == NULL) {
-			dbg_print(FC_CRC_DEBUG, "%s: codec_mm_vmap failed phy: 0x%x\n",
-				__func__, (unsigned int)phyaddr);
-			return -1;
-		}
-		crc = crc32_le(crc, vaddr, tmp_size);
+	/*single mode cannot use codec_mm_vmap*/
+	if (single_mode_vdec != NULL) {
+		unsigned int offset = phyaddr & (~PAGE_MASK);
+		while (size > 0) {
+			if (offset + size >= PAGE_SIZE) {
+				vaddr = kmap_atomic(phys_to_page(phyaddr));
+				tmp_size = (PAGE_SIZE - offset);
+				phyaddr += tmp_size;
+				size -= tmp_size;
+				vaddr += offset;
+			} else {
+				vaddr = kmap_atomic(phys_to_page(phyaddr));
+				tmp_size = size;
+				vaddr += offset;
+				size = 0;
+			}
+			if (vaddr == NULL) {
+				dbg_print(FC_CRC_DEBUG, "%s: kmap_atomic failed phy: 0x%x\n",
+					__func__, (unsigned int)phyaddr);
+				return -1;
+			}
+			/*
+			codec_mm_dma_flush(vaddr,
+				tmp_size, DMA_FROM_DEVICE);
+			*/
+			crc = crc32_le(crc, vaddr, tmp_size);
 
-		codec_mm_unmap_phyaddr(vaddr);
+			kunmap_atomic(vaddr - offset);
+			offset = 0;
+		}
+	} else {
+		while (size > 0) {
+			if (size >= VMAP_STRIDE_SIZE) {
+				vaddr = codec_mm_vmap(phyaddr, VMAP_STRIDE_SIZE);
+				tmp_size = VMAP_STRIDE_SIZE;
+				phyaddr += VMAP_STRIDE_SIZE;
+				size -= VMAP_STRIDE_SIZE;
+			} else {
+				vaddr = codec_mm_vmap(phyaddr, size);
+				tmp_size = size;
+				size = 0;
+			}
+			if (vaddr == NULL) {
+				dbg_print(FC_CRC_DEBUG, "%s: codec_mm_vmap failed phy: 0x%x\n",
+					__func__, (unsigned int)phyaddr);
+				return -1;
+			}
+			codec_mm_dma_flush(vaddr,
+				tmp_size, DMA_FROM_DEVICE);
+
+			crc = crc32_le(crc, vaddr, tmp_size);
+
+			codec_mm_unmap_phyaddr(vaddr);
+		}
 	}
 	*crc32 = crc;
 
@@ -669,22 +750,24 @@ static int fbc_check_prepare(struct pic_check_t *check,
 	return 0;
 }
 
-static struct vdec_s *single_mode_vdec = NULL;
+
 
 int decoder_do_frame_check(struct vdec_s *vdec, struct vframe_s *vf)
 {
-	int ret = 0;
 	int resize = 0;
 	void *planes[4];
 	struct pic_check_t *check = NULL;
 	struct pic_check_mgr_t *mgr = NULL;
+	int ret = 0;
 
 	if (vdec == NULL) {
 		if (single_mode_vdec == NULL)
 			return 0;
 		mgr = &single_mode_vdec->vfc;
-	} else
+	} else {
 		mgr = &vdec->vfc;
+		single_mode_vdec = NULL;
+	}
 
 	if ((mgr == NULL) ||
 		(vf == NULL) ||
@@ -705,7 +788,12 @@ int decoder_do_frame_check(struct vdec_s *vdec, struct vframe_s *vf)
 	if (vf->type & VIDTYPE_VIU_NV21) {
 		if (canvas_get_virt_addr(mgr, vf) < 0)
 			return -2;
-
+		if ((mgr->y_vaddr) && (mgr->uv_vaddr)) {
+			codec_mm_dma_flush(mgr->y_vaddr,
+				mgr->size_y, DMA_FROM_DEVICE);
+			codec_mm_dma_flush(mgr->uv_vaddr,
+				mgr->size_uv, DMA_FROM_DEVICE);
+		}
 		if (mgr->enable & CRC_MASK)
 			ret = do_check_nv21(mgr, vf);
 		if (mgr->enable & YUV_MASK)
@@ -726,10 +814,14 @@ int decoder_do_frame_check(struct vdec_s *vdec, struct vframe_s *vf)
 		planes[1] = check->fbc_planes[1];
 		planes[2] = check->fbc_planes[2];
 		planes[3] = check->fbc_planes[3];
-		AMLOGIC_FBC_vframe_decoder(planes, vf, 0, 0);
-		do_check_yuv16(mgr, vf,
-			(void *)planes[0], (void *)planes[3],//uv
-			(void *)planes[1], (void *)planes[2]);
+		ret = AMLOGIC_FBC_vframe_decoder(planes, vf, 0, 0);
+		if (ret < 0) {
+			dbg_print(0, "amlogic_fbc_lib.ko error %d\n", ret);
+		} else {
+			do_check_yuv16(mgr, vf,
+				(void *)planes[0], (void *)planes[3],//uv
+				(void *)planes[1], (void *)planes[2]);
+		}
 	}
 	mgr->frame_cnt++;
 
@@ -815,7 +907,7 @@ int frame_check_init(struct pic_check_mgr_t *mgr, int id)
 		"%s%s", CRC_PATH, comp_crc);
 
 	/* create crc32 log file */
-	check->check_fp = file_open(O_WRONLY | O_CREAT,
+	check->check_fp = file_open(O_CREAT| O_WRONLY | O_TRUNC,
 		"%s%s-%d-%d.crc", CRC_PATH, comp_crc, id, mgr->file_cnt);
 
 	INIT_KFIFO(check->new_chk_q);
@@ -826,15 +918,17 @@ int frame_check_init(struct pic_check_mgr_t *mgr, int id)
 	} else {
 		void *qaddr = NULL, *rdret = NULL;
 		check->cmp_crc_cnt = 0;
-		for (i = 0; i < SIZE_CHECK_Q &&
-			(check->compare_fp != NULL); i++) {
+		for (i = 0; i < SIZE_CHECK_Q; i++) {
 			qaddr = check->check_addr + i * SIZE_CRC;
 			rdret = fget_crc_str(qaddr,
 				SIZE_CRC, check);
 			if (rdret == NULL) {
-				dbg_print(0, "can't get compare crc string\n");
-				filp_close(check->compare_fp, current->files);
-				check->compare_fp = NULL;
+				if (i < 3)
+					dbg_print(0, "can't get compare crc string\n");
+				if (check->compare_fp) {
+					filp_close(check->compare_fp, current->files);
+					check->compare_fp = NULL;
+				}
 			}
 
 			kfifo_put(&check->new_chk_q, qaddr);
@@ -899,20 +993,18 @@ void frame_check_exit(struct pic_check_mgr_t *mgr)
 }
 
 
-
-static unsigned int yuv_enable, check_enable;
-static unsigned int yuv_start[MAX_INSTANCE_MUN];
-static unsigned int yuv_num[MAX_INSTANCE_MUN];
-
-
 int vdec_frame_check_init(struct vdec_s *vdec)
 {
 	int ret = 0, id = 0;
 
-	if ((vdec == NULL) ||
-		(vdec->is_reset))
+	if (vdec == NULL)
 		return 0;
 
+	if ((vdec->is_reset) &&
+		(get_cpu_major_id() != AM_MESON_CPU_MAJOR_ID_GXL))
+		return 0;
+
+	vdec->vfc.err_crc_block = 0;
 	if (!check_enable && !yuv_enable)
 		return 0;
 
@@ -924,7 +1016,9 @@ int vdec_frame_check_init(struct vdec_s *vdec)
 
 	if (check_enable & (0x01 << id)) {
 		frame_check_init(&vdec->vfc, id);
-		check_enable &= ~(0x01 << id);
+		/*repeat check one video crc32, not clear enable*/
+		if ((fc_debug & FC_CHECK_CRC_LOOP_MODE) == 0)
+			check_enable &= ~(0x01 << id);
 	}
 
 	if (yuv_enable & (0x01 << id)) {
@@ -1044,9 +1138,24 @@ ssize_t frame_check_show(struct class *class,
 	pbuf += sprintf(pbuf,
 		"\nUsage:\techo [id]  [1:on/0:off] > frame_check\n\n");
 
+	if (fc_debug & FC_ERR_CRC_BLOCK_MODE) {
+		/* cat frame_check to next frame when block */
+		struct vdec_s *vdec = NULL;
+		vdec = vdec_get_with_id(__ffs(check_enable));
+		if (vdec)
+			vdec->vfc.err_crc_block = 0;
+	}
+
 	return pbuf - buf;
 }
 
 
+module_param_string(comp_crc, comp_crc, 128, 0664);
+MODULE_PARM_DESC(comp_crc, "\n crc_filename\n");
 
+module_param(fc_debug, uint, 0664);
+MODULE_PARM_DESC(fc_debug, "\n frame check debug\n");
+
+module_param(size_yuv_buf, uint, 0664);
+MODULE_PARM_DESC(size_yuv_buf, "\n size_yuv_buf\n");
 

drivers/amlogic/media_modules/frame_provider/decoder/utils/frame_check.h

@@ -71,6 +71,7 @@ struct pic_check_mgr_t{
 	void *uv_vaddr;
 	ulong y_phyaddr;
 	ulong uv_phyaddr;
+	int err_crc_block;
 
 	int file_cnt;
 	atomic_t work_inited;

drivers/amlogic/media_modules/frame_provider/decoder/utils/vdec.c

@@ -1614,7 +1614,7 @@ static const char *get_dev_name(bool use_legacy_vdec, int format)
 #endif
 }
 
-struct vdec_s *vdec_get_with_id(unsigned id)
+struct vdec_s *vdec_get_with_id(unsigned int id)
 {
 	struct vdec_s *vdec, *ret_vdec = NULL;
 	struct vdec_core_s *core = vdec_core;
@@ -2205,6 +2205,10 @@ unsigned long vdec_ready_to_run(struct vdec_s *vdec, unsigned long mask)
 	if (!vdec->run_ready)
 		return false;
 
+	/* when crc32 error, block at error frame */
+	if (vdec->vfc.err_crc_block)
+		return false;
+
 	if ((vdec->slave || vdec->master) &&
 		(vdec->sched == 0))
 		return false;

drivers/amlogic/media_modules/frame_provider/decoder/utils/vdec.h

@@ -201,6 +201,7 @@ struct vdec_s {
 	/* input */
 	struct vdec_input_s input;
 
+	/*frame check*/
 	struct pic_check_mgr_t vfc;
 
 	/* mc cache */
@@ -437,8 +438,6 @@ int vdec_get_status(struct vdec_s *vdec);
 
 void vdec_set_timestamp(struct vdec_s *vdec, u64 timestamp);
 
-struct vdec_s *vdec_get_with_id(unsigned id);
-
-void *vdec_get_active_vfc(int core_mask);
+struct vdec_s *vdec_get_with_id(unsigned int id);
 
 #endif				/* VDEC_H */