hdr: TM2 bringup disable lc/cm [1/1]

PD#SWPL-6720

Problem:
video display color green

Solution:
TM2 bringup disable lc/cm

Verify:
verify on TM2

Change-Id: I2d8222c92f8181710a13a56f650655281fac5115
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
index c9ae478..fb12609 100644 (file)
--- 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 26d1704..b01a7ca 100644 (file)
--- 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 b773bfd..b884bf7 100644 (file)
--- 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 d69847c..3773cf2 100644 (file)
--- 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 a2b0b84..dec915a 100644 (file)
--- 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 ae52c08..45bbcf2 100644 (file)
--- 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 69f643e..fa12ef3 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.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_ab309.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
index 29906db..d5a4d47 100644 (file)
--- 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 39a36af..a7efc93 100644 (file)
--- 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 664b2ee..fdd610c 100644 (file)
--- 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 */