From: Zheng Yang <zhengyang@rock-chips.com>
Date: Wed, 7 Oct 2015 02:55:33 +0000 (+0800)
Subject: video: rockchip: hdmi: fix error of 8/10 bit color depth selection
X-Git-Tag: firefly_0821_release~3738
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=98c09006747c9354ea5d7b0c4f0cf6e2355193df;p=firefly-linux-kernel-4.4.55.git

video: rockchip: hdmi: fix error of 8/10 bit color depth selection

Change-Id: I3c9c35dced4db9b5f103d0d3de482f33d7257ae0
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
---

diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c b/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c
index a7a83265d49c..99fd73fadcb7 100644
--- a/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c
@@ -116,13 +116,12 @@ static void hdmi_wq_set_video(struct hdmi *hdmi)
 			deepcolor = hdmi->edid.deepcolor;
 		}
 		if ((hdmi->property->feature & SUPPORT_DEEP_10BIT) &&
-		    (deepcolor & HDMI_DEEP_COLOR_30BITS)) {
-			if (hdmi->colordepth == HDMI_DEPP_COLOR_AUTO ||
-			    hdmi->colordepth == 10)
-				video->color_output_depth = 10;
-		} else {
+		    (deepcolor & HDMI_DEEP_COLOR_30BITS) &&
+		    (hdmi->colordepth == HDMI_DEPP_COLOR_AUTO ||
+		     hdmi->colordepth == 10))
+			video->color_output_depth = 10;
+		else
 			video->color_output_depth = 8;
-		}
 	}
 	pr_info("hdmi output corlor mode is %d\n", video->color_output);
 	if ((hdmi->property->feature & SUPPORT_YCBCR_INPUT) &&