diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
index 3d436215e73e..f709ee48da04 100644
--- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
@@ -484,7 +484,7 @@
 		status = "okay";
 		gamma_en = <1>;/*1:enabel ;0:disable*/
 		wb_en = <1>;/*1:enabel ;0:disable*/
-		cm_en = <1>;/*1:enabel ;0:disable*/
+		cm_en = <0>;/*1:enabel ;0:disable*/
 		wb_sel = <1>;/*1:mtx ;0:gainoff*/
 		vlock_en = <1>;/*1:enable;0:disable*/
 		vlock_mode = <0x4>;
diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts
index 5b48c4c40d7a..e2922a8fe025 100644
--- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts
@@ -472,7 +472,7 @@
 		status = "okay";
 		gamma_en = <1>;/*1:enabel ;0:disable*/
 		wb_en = <1>;/*1:enabel ;0:disable*/
-		cm_en = <1>;/*1:enabel ;0:disable*/
+		cm_en = <0>;/*1:enabel ;0:disable*/
 		wb_sel = <1>;/*1:mtx ;0:gainoff*/
 		vlock_en = <1>;/*1:enable;0:disable*/
 		vlock_mode = <0x4>;
diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts
index 1768e753bb6e..d6355aa0a47a 100644
--- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts
@@ -484,7 +484,7 @@
 		status = "okay";
 		gamma_en = <1>;/*1:enabel ;0:disable*/
 		wb_en = <1>;/*1:enabel ;0:disable*/
-		cm_en = <1>;/*1:enabel ;0:disable*/
+		cm_en = <0>;/*1:enabel ;0:disable*/
 		wb_sel = <1>;/*1:mtx ;0:gainoff*/
 		vlock_en = <1>;/*1:enable;0:disable*/
 		vlock_mode = <0x4>;
diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
index c45908ad6fd8..39b494fc2c7b 100644
--- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
@@ -472,7 +472,7 @@
 		status = "okay";
 		gamma_en = <1>;/*1:enabel ;0:disable*/
 		wb_en = <1>;/*1:enabel ;0:disable*/
-		cm_en = <1>;/*1:enabel ;0:disable*/
+		cm_en = <0>;/*1:enabel ;0:disable*/
 		wb_sel = <1>;/*1:mtx ;0:gainoff*/
 		vlock_en = <1>;/*1:enable;0:disable*/
 		vlock_mode = <0x4>;
diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
index 63d3604054be..bad6ec73d05c 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
@@ -479,7 +479,7 @@
 		status = "okay";
 		gamma_en = <1>;/*1:enabel ;0:disable*/
 		wb_en = <1>;/*1:enabel ;0:disable*/
-		cm_en = <1>;/*1:enabel ;0:disable*/
+		cm_en = <0>;/*1:enabel ;0:disable*/
 		wb_sel = <1>;/*1:mtx ;0:gainoff*/
 		vlock_en = <1>;/*1:enable;0:disable*/
 		vlock_mode = <0x4>;
diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts
index 0bb9c1b7b141..c25a7523a8e7 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts
@@ -471,7 +471,7 @@
 		status = "okay";
 		gamma_en = <1>;/*1:enabel ;0:disable*/
 		wb_en = <1>;/*1:enabel ;0:disable*/
-		cm_en = <1>;/*1:enabel ;0:disable*/
+		cm_en = <0>;/*1:enabel ;0:disable*/
 		wb_sel = <1>;/*1:mtx ;0:gainoff*/
 		vlock_en = <1>;/*1:enable;0:disable*/
 		vlock_mode = <0x4>;
diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
index 025cc12d8e4a..767bcb535032 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
@@ -479,7 +479,7 @@
 		status = "okay";
 		gamma_en = <1>;/*1:enabel ;0:disable*/
 		wb_en = <1>;/*1:enabel ;0:disable*/
-		cm_en = <1>;/*1:enabel ;0:disable*/
+		cm_en = <0>;/*1:enabel ;0:disable*/
 		wb_sel = <1>;/*1:mtx ;0:gainoff*/
 		vlock_en = <1>;/*1:enable;0:disable*/
 		vlock_mode = <0x4>;
diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
index 5311b1d6b615..6deb65398333 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
@@ -471,7 +471,7 @@
 		status = "okay";
 		gamma_en = <1>;/*1:enabel ;0:disable*/
 		wb_en = <1>;/*1:enabel ;0:disable*/
-		cm_en = <1>;/*1:enabel ;0:disable*/
+		cm_en = <0>;/*1:enabel ;0:disable*/
 		wb_sel = <1>;/*1:mtx ;0:gainoff*/
 		vlock_en = <1>;/*1:enable;0:disable*/
 		vlock_mode = <0x4>;
diff --git a/drivers/amlogic/media/enhancement/amvecm/local_contrast.c b/drivers/amlogic/media/enhancement/amvecm/local_contrast.c
index 39a36af6adda..a7efc935df28 100644
--- a/drivers/amlogic/media/enhancement/amvecm/local_contrast.c
+++ b/drivers/amlogic/media/enhancement/amvecm/local_contrast.c
@@ -38,7 +38,7 @@ int amlc_debug;
 			pr_info("AMVE: " fmt, ## args);\
 	} while (0)
 
-int lc_en = 1;
+int lc_en;
 int lc_demo_mode;
 int lc_en_chflg = 0xff;
 static int lc_flag = 0xff;
diff --git a/drivers/amlogic/media/video_sink/video.c b/drivers/amlogic/media/video_sink/video.c
index 5722a3b2e2b4..b3f97e5479f9 100644
--- a/drivers/amlogic/media/video_sink/video.c
+++ b/drivers/amlogic/media/video_sink/video.c
@@ -167,7 +167,7 @@ static DEFINE_MUTEX(omx_mutex);
 
 #define DURATION_GCD 750
 
-static bool bypass_cm;
+static bool bypass_cm = 1;
 
 static bool bypass_pps = true;
 /*For 3D usage ----0:  mbx   1: tv */