amvecm: optimize amvecm update in vsync [1/1]

PD#SWPL-6475 Problem: hdmi input signal, video flicker Solution: optimize amvecm update in vsync Verify: verify on TL1 Change-Id: I3379333053fc52b8a33747ca83b1d6d68ea874ab Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
hardkernel · May 7, 2019 · 2677784 · 2677784
1 parent 099f0e2
commit 2677784
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 23 deletions.
diff --git a/drivers/amlogic/media/enhancement/amvecm/amcsc.c b/drivers/amlogic/media/enhancement/amvecm/amcsc.c
@@ -6375,15 +6375,6 @@ static void video_process(
 		pr_csc("saturation offset = %d.\n",
 			saturation_offset);
 		cur_csc_type = csc_type;
-
-		if (vf) {
-			if ((cur_csc_type == VPP_MATRIX_BT2020YUV_BT2020RGB) &&
-				(cur_csc_type != 0xffff) &&
-				(vf->source_type == VFRAME_SOURCE_TYPE_HDMI)) {
-				amvecm_wakeup_queue();
-				pr_csc("wake up hdr status queue.\n");
-			}
-		}
 	}
 }
 

diff --git a/drivers/amlogic/media/video_sink/video.c b/drivers/amlogic/media/video_sink/video.c
@@ -6820,20 +6820,6 @@ static irqreturn_t vsync_isr_in(int irq, void *dev_id)
 			set_hdr_to_frame(vf);
 #endif
 
-#if defined(CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_VECM)
-			refresh_on_vs(vf);
-			if (amvecm_on_vs(
-				(cur_dispbuf != &vf_local)
-				? cur_dispbuf : NULL,
-				vf, CSC_FLAG_CHECK_OUTPUT,
-				cur_frame_par ?
-				cur_frame_par->supsc1_hori_ratio :
-				0,
-				cur_frame_par ?
-				cur_frame_par->supsc1_vert_ratio :
-				0) == 1)
-				break;
-#endif
 			/*
 			 *two special case:
 			 *case1:4k display case,input buffer not enough &
@@ -6884,6 +6870,22 @@ static irqreturn_t vsync_isr_in(int irq, void *dev_id)
 					video_3d_format = vf->trans_fmt;
 				}
 			}
+
+#if defined(CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_VECM)
+			refresh_on_vs(vf);
+			if (amvecm_on_vs(
+				(cur_dispbuf != &vf_local)
+				? cur_dispbuf : NULL,
+				vf, CSC_FLAG_CHECK_OUTPUT,
+				cur_frame_par ?
+				cur_frame_par->supsc1_hori_ratio :
+				0,
+				cur_frame_par ?
+				cur_frame_par->supsc1_vert_ratio :
+				0) == 1)
+				break;
+#endif
+
 			vsync_toggle_frame(vf, __LINE__);
 			toggle_frame = vf;
 #ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION