cat66121:fix display problem

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 cc8a625c7ae434add11b7b2e2880051b2c0aef95..4aa324660034d5eaece7c322dadb0659ce0cfb00 100755 (executable)
--- 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)\r
 {\r
        hdmi_dbg(hdmi->dev, "[%s]\n", __FUNCTION__);\r
-       rk30_mux_api_set(GPIO0C1_FLASHDATA9_NAME, GPIO0C_GPIO0C1);\r
-       if (gpio_request(RK30_PIN0_PC1, NULL)) {\r
+#if 0\r
+       if (gpio_request(RK30_PIN3_PB2, NULL)) {\r
                printk("func %s, line %d: request gpio fail\n", __FUNCTION__, __LINE__);\r
                return -1;\r
        }\r
-       gpio_direction_output(RK30_PIN0_PC1, GPIO_LOW);\r
-       gpio_set_value(RK30_PIN0_PC1, GPIO_LOW);\r
+       gpio_direction_output(RK30_PIN3_PB2, GPIO_LOW);\r
+       gpio_set_value(RK30_PIN3_PB2, GPIO_LOW);\r
        msleep(200);\r
-       gpio_set_value(RK30_PIN0_PC1, GPIO_HIGH);\r
-       msleep(200);\r
-\r
+       gpio_set_value(RK30_PIN3_PB2, GPIO_HIGH);\r
+#endif\r
        mdelay(5);\r
        VideoPixelClock = 0;\r
        pixelrep = 0;\r
@@ -173,8 +172,6 @@ int cat66121_hdmi_sys_detect_hpd(void)
        //sysstat = HDMITX_ReadI2C_Byte(REG_SYS_STATUS) ;   \r
        //*hpdstatus = ((sysstat & B_HPDETECT) == B_HPDETECT)?TRUE:FALSE ;\r
        hdmi_status = HDMITX_DevLoopProc();\r
-;\r
-               return HDMI_HPD_ACTIVED;\r
        if(hdmi_status)\r
                return HDMI_HPD_ACTIVED;\r
        else\r
@@ -196,8 +193,6 @@ static void cat66121_sys_config_avi(int VIC, int bOutputColorMode, int aspec, in
 \r
 int cat66121_hdmi_sys_config_video(struct hdmi_video_para *vpara)\r
 {\r
-       printk( "[%s]\n", __FUNCTION__);\r
-       printk( "[%s]\n", __FUNCTION__);\r
     HDMITX_ChangeDisplayOption(vpara->vic,HDMI_RGB444) ;\r
 \r
        return HDMI_ERROR_SUCESS;\r

diff --git a/drivers/video/rockchip/hdmi/chips/cat66121/config.h b/drivers/video/rockchip/hdmi/chips/cat66121/config.h
index 5e13aa6aec6d9c326f9944488d02dbd2d49a635e..681d29640bc86e1b2d23661f4db186ef88c1a9f2 100755 (executable)
--- 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\r
 \r
 #define SUPPORT_EDID\r
-#define SUPPORT_HDCP\r
+//#define SUPPORT_HDCP\r
 //#define SUPPORT_SHA\r
 //#define SUPPORT_AUDIO_MONITOR\r
 #define AudioOutDelayCnt 250\r

diff --git a/drivers/video/rockchip/hdmi/chips/cat66121/hdmitx_sys.c b/drivers/video/rockchip/hdmi/chips/cat66121/hdmitx_sys.c
index 5ffb5abd1bac67c73e922d370dedd90e94968243..e0dfd4b659df05cddbe9bcac6944d540806b0edb 100755 (executable)
--- 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 ;\r
                                        bOutputColorMode |= F_MODE_YUV422 ;\r
                                }\r
+                               bOutputColorMode = F_MODE_RGB444;\r
+\r
 \r
             #ifdef IT6615\r
                 if(RxCapability.dc.uc & (HDMI_DC_SUPPORT_36|HDMI_DC_SUPPORT_30))\r