From 38697c8bce9fb063f0155b992d22723faf0230df Mon Sep 17 00:00:00 2001
From: yzq <yzq@rock-chips.com>
Date: Sat, 26 Jan 2013 21:40:39 +0800
Subject: [PATCH] cat66121:fix display problem

---
 .../hdmi/chips/cat66121/cat66121_hdmi_hw.c      | 17 ++++++-----------
 .../video/rockchip/hdmi/chips/cat66121/config.h |  2 +-
 .../rockchip/hdmi/chips/cat66121/hdmitx_sys.c   |  2 ++
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/drivers/video/rockchip/hdmi/chips/cat66121/cat66121_hdmi_hw.c b/drivers/video/rockchip/hdmi/chips/cat66121/cat66121_hdmi_hw.c
index cc8a625c7ae4..4aa324660034 100755
--- a/drivers/video/rockchip/hdmi/chips/cat66121/cat66121_hdmi_hw.c
+++ b/drivers/video/rockchip/hdmi/chips/cat66121/cat66121_hdmi_hw.c
@@ -134,17 +134,16 @@ SYS_STATUS HDMITX_SetI2C_Byte(BYTE Reg,BYTE Mask,BYTE Value)
 int cat66121_hdmi_sys_init(void)
 {
 	hdmi_dbg(hdmi->dev, "[%s]\n", __FUNCTION__);
-	rk30_mux_api_set(GPIO0C1_FLASHDATA9_NAME, GPIO0C_GPIO0C1);
-	if (gpio_request(RK30_PIN0_PC1, NULL)) {
+#if 0
+	if (gpio_request(RK30_PIN3_PB2, NULL)) {
 		printk("func %s, line %d: request gpio fail\n", __FUNCTION__, __LINE__);
 		return -1;
 	}
-	gpio_direction_output(RK30_PIN0_PC1, GPIO_LOW);
-	gpio_set_value(RK30_PIN0_PC1, GPIO_LOW);
+	gpio_direction_output(RK30_PIN3_PB2, GPIO_LOW);
+	gpio_set_value(RK30_PIN3_PB2, GPIO_LOW);
 	msleep(200);
-	gpio_set_value(RK30_PIN0_PC1, GPIO_HIGH);
-	msleep(200);
-
+	gpio_set_value(RK30_PIN3_PB2, GPIO_HIGH);
+#endif
 	mdelay(5);
 	VideoPixelClock = 0;
 	pixelrep = 0;
@@ -173,8 +172,6 @@ int cat66121_hdmi_sys_detect_hpd(void)
 	//sysstat = HDMITX_ReadI2C_Byte(REG_SYS_STATUS) ;   
 	//*hpdstatus = ((sysstat & B_HPDETECT) == B_HPDETECT)?TRUE:FALSE ;
 	hdmi_status = HDMITX_DevLoopProc();
-;
-		return HDMI_HPD_ACTIVED;
 	if(hdmi_status)
 		return HDMI_HPD_ACTIVED;
 	else
@@ -196,8 +193,6 @@ static void cat66121_sys_config_avi(int VIC, int bOutputColorMode, int aspec, in
 
 int cat66121_hdmi_sys_config_video(struct hdmi_video_para *vpara)
 {
-	printk( "[%s]\n", __FUNCTION__);
-	printk( "[%s]\n", __FUNCTION__);
     HDMITX_ChangeDisplayOption(vpara->vic,HDMI_RGB444) ;
 
 	return HDMI_ERROR_SUCESS;
diff --git a/drivers/video/rockchip/hdmi/chips/cat66121/config.h b/drivers/video/rockchip/hdmi/chips/cat66121/config.h
index 5e13aa6aec6d..681d29640bc8 100755
--- a/drivers/video/rockchip/hdmi/chips/cat66121/config.h
+++ b/drivers/video/rockchip/hdmi/chips/cat66121/config.h
@@ -17,7 +17,7 @@
 #endif // EXTERN_HDCPROM
 
 #define SUPPORT_EDID
-#define SUPPORT_HDCP
+//#define SUPPORT_HDCP
 //#define SUPPORT_SHA
 //#define SUPPORT_AUDIO_MONITOR
 #define AudioOutDelayCnt 250
diff --git a/drivers/video/rockchip/hdmi/chips/cat66121/hdmitx_sys.c b/drivers/video/rockchip/hdmi/chips/cat66121/hdmitx_sys.c
index 5ffb5abd1bac..e0dfd4b659df 100755
--- a/drivers/video/rockchip/hdmi/chips/cat66121/hdmitx_sys.c
+++ b/drivers/video/rockchip/hdmi/chips/cat66121/hdmitx_sys.c
@@ -474,6 +474,8 @@ int HDMITX_DevLoopProc()
 					bOutputColorMode &= ~F_MODE_CLRMOD_MASK ;
 					bOutputColorMode |= F_MODE_YUV422 ;
 				}
+				bOutputColorMode = F_MODE_RGB444;
+
 
             #ifdef IT6615
                 if(RxCapability.dc.uc & (HDMI_DC_SUPPORT_36|HDMI_DC_SUPPORT_30))
-- 
2.34.1