From: zwl <zwl@rock-chips.com>
Date: Thu, 24 Apr 2014 12:51:12 +0000 (+0800)
Subject: rk3288 hdmi: cancel the color depth of 12bit and 16bit mode for source is unsupported
X-Git-Tag: firefly_0821_release~5435
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c2f5ced9356e5fa0a40eba9f4dfe78d2dd328e51;p=firefly-linux-kernel-4.4.55.git

rk3288 hdmi: cancel the color depth of 12bit and 16bit mode for source is unsupported
---

diff --git a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c
index b7c4aacd59d4..8472702031db 100644
--- a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c
+++ b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c
@@ -184,7 +184,7 @@ int rk3288_hdmi_read_edid(struct hdmi *hdmi_drv, int block, unsigned char *buff)
 					ret = 0;
 					hdmi_dbg(hdmi_drv->dev, "[%s] edid read sucess\n", __FUNCTION__);
 
-				#if 1//def HDMI_DEBUG
+				#ifdef HDMI_DEBUG
 					for(i = 0; i < 128; i++) {
 						printk("%02x ,", buff[i]);
 						if( (i + 1) % 16 == 0)
diff --git a/drivers/video/rockchip/hdmi/rk_hdmi_lcdc.c b/drivers/video/rockchip/hdmi/rk_hdmi_lcdc.c
index 0e5976f5c206..7d5e7e7844cd 100755
--- a/drivers/video/rockchip/hdmi/rk_hdmi_lcdc.c
+++ b/drivers/video/rockchip/hdmi/rk_hdmi_lcdc.c
@@ -559,11 +559,14 @@ int hdmi_init_video_para(struct hdmi *hdmi_drv, struct hdmi_video_para *video)
 	video->format_3d = 0; 	/*TODO modify according to EDID if need*/
 	video->pixel_repet = 0;
 
+#ifdef SOURCE_ABOVE_10BIT
 	if (hdmi_drv->edid.deepcolor & HDMI_COLOR_DEPTH_16BIT)
 		video->color_depth = HDMI_COLOR_DEPTH_16BIT;
 	else if (hdmi_drv->edid.deepcolor & HDMI_COLOR_DEPTH_12BIT)
 		video->color_depth = HDMI_COLOR_DEPTH_12BIT;
-	else if (hdmi_drv->edid.deepcolor & HDMI_COLOR_DEPTH_10BIT)
+	else
+#endif
+	if (hdmi_drv->edid.deepcolor & HDMI_COLOR_DEPTH_10BIT)
 		video->color_depth = HDMI_COLOR_DEPTH_10BIT;
 	else
 		video->color_depth = HDMI_COLOR_DEPTH_8BIT;