From 68591db5ff0b500d876ac5b768a9fe88916628e3 Mon Sep 17 00:00:00 2001 From: Sandor Yu Date: Wed, 19 Feb 2014 16:40:49 +0800 Subject: ENGR00299600 hdmi:yocto gui can not show to some TV on ard board For i.MX6 ARD board, the board not support read EDID from TV, so HDMI driver will create a default support mode list when system bootup. Because yocto xserver can not get video mode information from framebuffer now, and xserver will set default video mode XGA to framebuffer, but XGA mode is not support by hdmi. Remove XGA and SXGA from default support list. HDMI driver will find a nearest match video mode in support list. It is VGA mode. HDMI support VGA mode well. Issue is fixed. Signed-off-by: Sandor Yu --- drivers/video/mxc/mxc_hdmi.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'drivers') diff --git a/drivers/video/mxc/mxc_hdmi.c b/drivers/video/mxc/mxc_hdmi.c index cbf6b856bbc6..bf20720d1452 100644 --- a/drivers/video/mxc/mxc_hdmi.c +++ b/drivers/video/mxc/mxc_hdmi.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -99,19 +99,6 @@ static const struct fb_videomode vga_mode = { FB_VMODE_NONINTERLACED | FB_VMODE_ASPECT_4_3, FB_MODE_IS_VESA, }; -static const struct fb_videomode xga_mode = { - /* 13 1024x768-60 VESA */ - NULL, 60, 1024, 768, 15384, 160, 24, 29, 3, 136, 6, - 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA -}; - -static const struct fb_videomode sxga_mode = { - /* 20 1280x1024-60 VESA */ - NULL, 60, 1280, 1024, 9259, 248, 48, 38, 1, 112, 3, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, - FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA -}; - enum hdmi_datamap { RGB444_8B = 0x01, RGB444_10B = 0x03, @@ -1852,11 +1839,6 @@ static void mxc_hdmi_default_modelist(struct mxc_hdmi *hdmi) fb_destroy_modelist(&hdmi->fbi->modelist); - /*Add XGA and SXGA to default modelist */ - fb_add_videomode(&vga_mode, &hdmi->fbi->modelist); - fb_add_videomode(&xga_mode, &hdmi->fbi->modelist); - fb_add_videomode(&sxga_mode, &hdmi->fbi->modelist); - /*Add all no interlaced CEA mode to default modelist */ for (i = 0; i < ARRAY_SIZE(mxc_cea_mode); i++) { mode = &mxc_cea_mode[i]; @@ -2577,10 +2559,6 @@ static int mxc_hdmi_disp_init(struct mxc_dispdrv_handle *disp, fb_add_videomode(mode, &hdmi->fbi->modelist); } - /*Add XGA and SXGA to default modelist */ - fb_add_videomode(&xga_mode, &hdmi->fbi->modelist); - fb_add_videomode(&sxga_mode, &hdmi->fbi->modelist); - console_unlock(); /* Find a nearest mode in default modelist */ -- cgit v1.2.3