From: Zheng Yang <zhengyang@rock-chips.com>
Date: Fri, 22 May 2015 10:34:17 +0000 (+0800)
Subject: HDMI: register display type according lcdc property.
X-Git-Tag: firefly_0821_release~4125
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ab64cd261a81a7e472476cdf133b8d1a176815f4;p=firefly-linux-kernel-4.4.55.git

HDMI: register display type according lcdc property.

	If property of lcdc connected by HDMI is EXTERN,
	we register HDMI as a aux display device.

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 4c65868f8397..4b6cef9480bb 100644
--- a/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c
@@ -470,12 +470,15 @@ struct hdmi *rockchip_hdmi_register(struct hdmi_property *property,
 	hdmi->yscale = 100;
 	hdmi_init_modelist(hdmi);
 
-#ifndef CONFIG_ARCH_RK29
 	if (hdmi->property->videosrc == DISPLAY_SOURCE_LCDC0)
 		hdmi->lcdc = rk_get_lcdc_drv("lcdc0");
 	else
 		hdmi->lcdc = rk_get_lcdc_drv("lcdc1");
-#endif
+
+	if (hdmi->lcdc->prop == EXTEND)
+		hdmi->property->display = DISPLAY_AUX;
+	else
+		hdmi->property->display = DISPLAY_MAIN;
 	memset(name, 0, 32);
 	sprintf(name, "hdmi-%s", hdmi->property->name);
 	hdmi->workqueue = create_singlethread_workqueue(name);