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 4c65868f83977048231e011984079710ae3403cd..4b6cef9480bb421cb91d39f654f3682b0eb39c02 100644 (file)
--- 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);