From: Zheng Yang Date: Mon, 23 Apr 2012 03:30:02 +0000 (+0800) Subject: rk30:hdmi: when hdmi_set_info input vic is zero, use defalut hdmi mode timing. X-Git-Tag: firefly_0821_release~9343 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=73534786226a0af076b7b71f0ebddf069650b215;p=firefly-linux-kernel-4.4.55.git rk30:hdmi: when hdmi_set_info input vic is zero, use defalut hdmi mode timing. --- diff --git a/drivers/video/rockchip/hdmi/rk30_hdmi_lcdc.c b/drivers/video/rockchip/hdmi/rk30_hdmi_lcdc.c index 37dda19f51ef..f5df7aece0a5 100755 --- a/drivers/video/rockchip/hdmi/rk30_hdmi_lcdc.c +++ b/drivers/video/rockchip/hdmi/rk30_hdmi_lcdc.c @@ -66,9 +66,12 @@ int hdmi_set_info(struct rk29fb_screen *screen, unsigned int vic) { int i; - if(screen == NULL || vic == 0) + if(screen == NULL) return -1; + if(vic == 0) + vic = HDMI_VIDEO_DEFAULT_MODE; + for(i = 0; i < ARRAY_SIZE(hdmi_mode); i++) { if(hdmi_mode[i].flag == vic) @@ -495,7 +498,7 @@ int hdmi_switch_fb(struct hdmi *hdmi, int vic) return -1; } - rc = hdmi_set_info(hdmi->lcdc->screen, vic); + rc = hdmi_set_info(hdmi->lcdc->screen, hdmi->vic); if(rc == 0) { rk_fb_switch_screen(hdmi->lcdc->screen, 1, HDMI_SOURCE_DEFAULT);