PD#142052: update the macro define of ppmgr to avoid crash

Change-Id: I8e33046992b5db4831a6b3a0eabd274017eb222a
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>

11 files changed, 43 insertions, 44 deletions

diff --git a/drivers/frame_provider/decoder/avs/avs.c b/drivers/frame_provider/decoder/avs/avs.c
index 1578943..bb08d1e 100644
--- a/drivers/frame_provider/decoder/avs/avs.c
+++ b/drivers/frame_provider/decoder/avs/avs.c
@@ -988,7 +988,7 @@ static int vavs_vf_states(struct vframe_states *states, void *op_arg)
 	return 0;
 }
 
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 static void vavs_ppmgr_reset(void)
 {
 	vf_notify_receiver(PROVIDER_NAME, VFRAME_EVENT_PROVIDER_RESET, NULL);
@@ -1036,7 +1036,7 @@ static void vavs_put_timer_func(unsigned long arg)
 				mutex_lock(&vavs_mutex);
 				pr_info("vavs fatal error reset !\n");
 				amvdec_stop();
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 				vavs_ppmgr_reset();
 #else
 				vf_light_unreg_provider(&vavs_vf_prov);
@@ -1274,7 +1274,7 @@ static s32 vavs_init(void)
 
 	stat |= STAT_ISR_REG;
 
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 	vf_provider_init(&vavs_vf_prov, PROVIDER_NAME, &vavs_vf_provider, NULL);
 	vf_reg_provider(&vavs_vf_prov);
 	vf_notify_receiver(PROVIDER_NAME, VFRAME_EVENT_PROVIDER_START, NULL);
diff --git a/drivers/frame_provider/decoder/h264/vh264.c b/drivers/frame_provider/decoder/h264/vh264.c
index 86b9a26..990bd88 100644
--- a/drivers/frame_provider/decoder/h264/vh264.c
+++ b/drivers/frame_provider/decoder/h264/vh264.c
@@ -491,14 +491,14 @@ static int vh264_event_cb(int type, void *data, void *private_data)
 		unsigned long flags;
 
 		amvdec_stop();
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_light_unreg_provider(&vh264_vf_prov);
 #endif
 		spin_lock_irqsave(&lock, flags);
 		vh264_local_init();
 		vh264_prot_init();
 		spin_unlock_irqrestore(&lock, flags);
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_reg_provider(&vh264_vf_prov);
 #endif
 		amvdec_start();
@@ -549,7 +549,7 @@ static void set_frame_info(struct vframe_s *vf)
 	vf->orientation = vh264_rotation;
 	vf->flag = 0;
 
-#ifdef CONFIG_POST_PROCESS_MANAGER_3D_PROCESS
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER_3D_PROCESS
 	vf->trans_fmt = 0;
 	if ((vf->trans_fmt == TVIN_TFMT_3D_LRF) ||
 		(vf->trans_fmt == TVIN_TFMT_3D_LA)) {
@@ -578,7 +578,7 @@ static void set_frame_info(struct vframe_s *vf)
 
 }
 
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 static void vh264_ppmgr_reset(void)
 {
 	vf_notify_receiver(PROVIDER_NAME, VFRAME_EVENT_PROVIDER_RESET, NULL);
@@ -1979,7 +1979,7 @@ static void vh264_put_timer_func(unsigned long arg)
 				if (++wait_buffer_counter > 4) {
 					amvdec_stop();
 
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 					vh264_ppmgr_reset();
 #else
 					vf_light_unreg_provider(&vh264_vf_prov);
@@ -1994,7 +1994,7 @@ static void vh264_put_timer_func(unsigned long arg)
 		} else if (wait_i_pass_frames > 1000) {
 			pr_info("i passed frames > 1000\n");
 			amvdec_stop();
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 			vh264_ppmgr_reset();
 #else
 			vf_light_unreg_provider(&vh264_vf_prov);
@@ -2011,7 +2011,7 @@ static void vh264_put_timer_func(unsigned long arg)
 		if (vh264_no_disp_count++ > NO_DISP_WD_COUNT) {
 			pr_info("$$$decoder did not send frame out\n");
 			amvdec_stop();
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 			vh264_ppmgr_reset();
 #else
 			vf_light_unreg_provider(PROVIDER_NAME);
@@ -2484,7 +2484,7 @@ static s32 vh264_init(void)
 
 	stat |= STAT_ISR_REG;
 
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 	vf_provider_init(&vh264_vf_prov, PROVIDER_NAME, &vh264_vf_provider_ops,
 					 NULL);
 	vf_reg_provider(&vh264_vf_prov);
@@ -2595,7 +2595,7 @@ static void error_do_work(struct work_struct *work)
 	if (atomic_read(&vh264_active)) {
 		amvdec_stop();
 		vh264_reset  = 1;
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vh264_ppmgr_reset();
 #else
 		vf_light_unreg_provider(&vh264_vf_prov);
diff --git a/drivers/frame_provider/decoder/h264/vh264_4k2k.c b/drivers/frame_provider/decoder/h264/vh264_4k2k.c
index 370363a..d1bbe84 100644
--- a/drivers/frame_provider/decoder/h264/vh264_4k2k.c
+++ b/drivers/frame_provider/decoder/h264/vh264_4k2k.c
@@ -349,14 +349,14 @@ static int vh264_4k2k_event_cb(int type, void *data, void *private_data)
 
 		if (!H264_4K2K_SINGLE_CORE)
 			amvdec2_stop();
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_light_unreg_provider(&vh264_4k2k_vf_prov);
 #endif
 		spin_lock_irqsave(&lock, flags);
 		vh264_4k2k_local_init();
 		vh264_4k2k_prot_init();
 		spin_unlock_irqrestore(&lock, flags);
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_reg_provider(&vh264_4k2k_vf_prov);
 #endif
 		amvdec_start();
diff --git a/drivers/frame_provider/decoder/h264/vh264_mvc.c b/drivers/frame_provider/decoder/h264/vh264_mvc.c
index e575c50..56c1c44 100644
--- a/drivers/frame_provider/decoder/h264/vh264_mvc.c
+++ b/drivers/frame_provider/decoder/h264/vh264_mvc.c
@@ -502,14 +502,14 @@ static int vh264mvc_event_cb(int type, void *data, void *private_data)
 	if (type & VFRAME_EVENT_RECEIVER_RESET) {
 		unsigned long flags;
 		amvdec_stop();
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_light_unreg_provider(&vh264mvc_vf_prov);
 #endif
 		spin_lock_irqsave(&lock, flags);
 		vh264mvc_local_init();
 		vh264mvc_prot_init();
 		spin_unlock_irqrestore(&lock, flags);
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_reg_provider(&vh264mvc_vf_prov);
 #endif
 		amvdec_start();
diff --git a/drivers/frame_provider/decoder/h265/vh265.c b/drivers/frame_provider/decoder/h265/vh265.c
index 67a3e40..4039f66 100644
--- a/drivers/frame_provider/decoder/h265/vh265.c
+++ b/drivers/frame_provider/decoder/h265/vh265.c
@@ -5617,14 +5617,14 @@ static int vh265_event_cb(int type, void *data, void *op_arg)
 	if (type & VFRAME_EVENT_RECEIVER_RESET) {
 #if 0
 		amhevc_stop();
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_light_unreg_provider(&vh265_vf_prov);
 #endif
 		spin_lock_irqsave(&hevc->lock, flags);
 		vh265_local_init();
 		vh265_prot_init();
 		spin_unlock_irqrestore(&hevc->lock, flags);
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_reg_provider(&vh265_vf_prov);
 #endif
 		amhevc_start();
diff --git a/drivers/frame_provider/decoder/mjpeg/vmjpeg.c b/drivers/frame_provider/decoder/mjpeg/vmjpeg.c
index 1c75ba6..1926163 100644
--- a/drivers/frame_provider/decoder/mjpeg/vmjpeg.c
+++ b/drivers/frame_provider/decoder/mjpeg/vmjpeg.c
@@ -324,14 +324,14 @@ static int vmjpeg_event_cb(int type, void *data, void *private_data)
 	if (type & VFRAME_EVENT_RECEIVER_RESET) {
 		unsigned long flags;
 		amvdec_stop();
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_light_unreg_provider(&vmjpeg_vf_prov);
 #endif
 		spin_lock_irqsave(&lock, flags);
 		vmjpeg_local_init();
 		vmjpeg_prot_init();
 		spin_unlock_irqrestore(&lock, flags);
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_reg_provider(&vmjpeg_vf_prov);
 #endif
 		amvdec_start();
@@ -753,7 +753,7 @@ static s32 vmjpeg_init(void)
 
 	stat |= STAT_ISR_REG;
 
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 	vf_provider_init(&vmjpeg_vf_prov, PROVIDER_NAME, &vmjpeg_vf_provider,
 					 NULL);
 	vf_reg_provider(&vmjpeg_vf_prov);
diff --git a/drivers/frame_provider/decoder/mpeg12/vmpeg12.c b/drivers/frame_provider/decoder/mpeg12/vmpeg12.c
index 1cafadc..0b2f34c 100644
--- a/drivers/frame_provider/decoder/mpeg12/vmpeg12.c
+++ b/drivers/frame_provider/decoder/mpeg12/vmpeg12.c
@@ -557,14 +557,14 @@ static int vmpeg_event_cb(int type, void *data, void *private_data)
 	if (type & VFRAME_EVENT_RECEIVER_RESET) {
 		unsigned long flags;
 		amvdec_stop();
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_light_unreg_provider(&vmpeg_vf_prov);
 #endif
 		spin_lock_irqsave(&lock, flags);
 		vmpeg12_local_init();
 		vmpeg12_prot_init();
 		spin_unlock_irqrestore(&lock, flags);
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_reg_provider(&vmpeg_vf_prov);
 #endif
 		amvdec_start();
@@ -587,7 +587,7 @@ static int vmpeg_vf_states(struct vframe_states *states, void *op_arg)
 	return 0;
 }
 
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 static void vmpeg12_ppmgr_reset(void)
 {
 	vf_notify_receiver(PROVIDER_NAME, VFRAME_EVENT_PROVIDER_RESET, NULL);
@@ -633,7 +633,7 @@ static void vmpeg_put_timer_func(unsigned long arg)
 
 		amvdec_stop();
 
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vmpeg12_ppmgr_reset();
 #else
 		vf_light_unreg_provider(&vmpeg_vf_prov);
@@ -952,7 +952,7 @@ static s32 vmpeg12_init(void)
 	}
 
 	stat |= STAT_ISR_REG;
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 	vf_provider_init(&vmpeg_vf_prov, PROVIDER_NAME, &vmpeg_vf_provider,
 					 NULL);
 	vf_reg_provider(&vmpeg_vf_prov);
diff --git a/drivers/frame_provider/decoder/mpeg4/vmpeg4.c b/drivers/frame_provider/decoder/mpeg4/vmpeg4.c
index 3b47288..f20e579 100644
--- a/drivers/frame_provider/decoder/mpeg4/vmpeg4.c
+++ b/drivers/frame_provider/decoder/mpeg4/vmpeg4.c
@@ -598,14 +598,14 @@ static int vmpeg_event_cb(int type, void *data, void *private_data)
 	if (type & VFRAME_EVENT_RECEIVER_RESET) {
 		unsigned long flags;
 		amvdec_stop();
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_light_unreg_provider(&vmpeg_vf_prov);
 #endif
 		spin_lock_irqsave(&lock, flags);
 		vmpeg4_local_init();
 		vmpeg4_prot_init();
 		spin_unlock_irqrestore(&lock, flags);
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_reg_provider(&vmpeg_vf_prov);
 #endif
 		amvdec_start();
@@ -655,14 +655,14 @@ static void vmpeg_put_timer_func(unsigned long arg)
 		unsigned long flags;
 		pr_info("mpeg4 fatal error happened,need reset    !!\n");
 		amvdec_stop();
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_light_unreg_provider(&vmpeg_vf_prov);
 #endif
 		spin_lock_irqsave(&lock, flags);
 		vmpeg4_local_init();
 		vmpeg4_prot_init();
 		spin_unlock_irqrestore(&lock, flags);
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_reg_provider(&vmpeg_vf_prov);
 #endif
 		amvdec_start();
@@ -979,7 +979,7 @@ static s32 vmpeg4_init(void)
 	}
 
 	stat |= STAT_ISR_REG;
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 	vf_provider_init(&vmpeg_vf_prov, PROVIDER_NAME, &vmpeg_vf_provider,
 					 NULL);
 	vf_reg_provider(&vmpeg_vf_prov);
diff --git a/drivers/frame_provider/decoder/real/vreal.c b/drivers/frame_provider/decoder/real/vreal.c
index e1c48ed..ed8231c 100644
--- a/drivers/frame_provider/decoder/real/vreal.c
+++ b/drivers/frame_provider/decoder/real/vreal.c
@@ -379,14 +379,14 @@ static int vreal_event_cb(int type, void *data, void *private_data)
 	if (type & VFRAME_EVENT_RECEIVER_RESET) {
 		unsigned long flags;
 		amvdec_stop();
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_light_unreg_provider(&vreal_vf_prov);
 #endif
 		spin_lock_irqsave(&lock, flags);
 		vreal_local_init();
 		vreal_prot_init();
 		spin_unlock_irqrestore(&lock, flags);
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_reg_provider(&vreal_vf_prov);
 #endif
 		amvdec_start();
@@ -408,9 +408,8 @@ static int vreal_vf_states(struct vframe_states *states, void *op_arg)
 
 	return 0;
 }
-
 #if 0
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 static void vreal_ppmgr_reset(void)
 {
 	vf_notify_receiver(PROVIDER_NAME, VFRAME_EVENT_PROVIDER_RESET, NULL);
@@ -448,7 +447,7 @@ static void vreal_put_timer_func(unsigned long arg)
 		if (++wait_buffer_counter > 2) {
 			amvdec_stop();
 
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 			vreal_ppmgr_reset();
 #else
 			vf_light_unreg_provider(&vreal_vf_prov);
@@ -828,7 +827,7 @@ s32 vreal_init(struct vdec_s *vdec)
 	}
 
 	stat |= STAT_ISR_REG;
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 	vf_provider_init(&vreal_vf_prov, PROVIDER_NAME, &vreal_vf_provider,
 					 NULL);
 	vf_reg_provider(&vreal_vf_prov);
diff --git a/drivers/frame_provider/decoder/vc1/vvc1.c b/drivers/frame_provider/decoder/vc1/vvc1.c
index 16addf9..54b532e 100644
--- a/drivers/frame_provider/decoder/vc1/vvc1.c
+++ b/drivers/frame_provider/decoder/vc1/vvc1.c
@@ -667,14 +667,14 @@ static int vvc1_event_cb(int type, void *data, void *private_data)
 	if (type & VFRAME_EVENT_RECEIVER_RESET) {
 		unsigned long flags;
 		amvdec_stop();
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_light_unreg_provider(&vvc1_vf_prov);
 #endif
 		spin_lock_irqsave(&lock, flags);
 		vvc1_local_init();
 		vvc1_prot_init();
 		spin_unlock_irqrestore(&lock, flags);
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_reg_provider(&vvc1_vf_prov);
 #endif
 		amvdec_start();
@@ -901,7 +901,7 @@ static void vvc1_local_init(void)
 	}
 }
 
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 static void vvc1_ppmgr_reset(void)
 {
 	vf_notify_receiver(PROVIDER_NAME, VFRAME_EVENT_PROVIDER_RESET, NULL);
@@ -922,7 +922,7 @@ static void vvc1_put_timer_func(unsigned long arg)
 #if 1
 	if (READ_VREG(VC1_SOS_COUNT) > 10) {
 		amvdec_stop();
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vvc1_ppmgr_reset();
 #else
 		vf_light_unreg_provider(&vvc1_vf_prov);
@@ -1002,7 +1002,7 @@ static s32 vvc1_init(void)
 	}
 
 	stat |= STAT_ISR_REG;
-#ifdef CONFIG_POST_PROCESS_MANAGER
+#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 	vf_provider_init(&vvc1_vf_prov,
 		PROVIDER_NAME, &vvc1_vf_provider, NULL);
 	vf_reg_provider(&vvc1_vf_prov);
diff --git a/drivers/frame_provider/decoder/vp9/vvp9.c b/drivers/frame_provider/decoder/vp9/vvp9.c
index 594b29f..c01585e 100644
--- a/drivers/frame_provider/decoder/vp9/vvp9.c
+++ b/drivers/frame_provider/decoder/vp9/vvp9.c
@@ -5063,14 +5063,14 @@ static int vvp9_event_cb(int type, void *data, void *private_data)
 #if 0
 		unsigned long flags;
 		amhevc_stop();
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_light_unreg_provider(&vvp9_vf_prov);
 #endif
 		spin_lock_irqsave(&pbi->lock, flags);
 		vvp9_local_init();
 		vvp9_prot_init();
 		spin_unlock_irqrestore(&pbi->lock, flags);
-#ifndef CONFIG_POST_PROCESS_MANAGER
+#ifndef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
 		vf_reg_provider(&vvp9_vf_prov);
 #endif
 		amhevc_start();