From c54b9b8f76bfd8786c6cfbce942c1b1aebcb3ef1 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan.agner@toradex.com>
Date: Thu, 9 Jan 2014 13:20:53 +0100
Subject: tegra: video: parse multiple modedbs

In order to find a viable resolution we not only parse VESA mode,
we also parse CEA (multimedia) modes and our own small modedb (for
specific touch screens).
---
 arch/arm/mach-tegra/include/mach/dc.h |  3 +-
 drivers/video/tegra/dc/mode.c         | 78 +++++++++++++++++++++++++++++++++++
 drivers/video/tegra/fb.c              |  7 +++-
 3 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-tegra/include/mach/dc.h b/arch/arm/mach-tegra/include/mach/dc.h
index abab990aab23..13dc8c0be03a 100644
--- a/arch/arm/mach-tegra/include/mach/dc.h
+++ b/arch/arm/mach-tegra/include/mach/dc.h
@@ -601,5 +601,6 @@ void tegra_dc_put_edid(struct tegra_dc_edid *edid);
 int tegra_dc_set_flip_callback(int (*callback)(void));
 int tegra_dc_unset_flip_callback(void);
 int tegra_dc_get_panel_sync_rate(void);
-
+int tegra_fb_find_mode(struct fb_var_screeninfo *var, struct fb_info *info,
+		       const char* option, unsigned int default_bpp);
 #endif
diff --git a/drivers/video/tegra/dc/mode.c b/drivers/video/tegra/dc/mode.c
index 6de02200e188..0a0e730ad174 100644
--- a/drivers/video/tegra/dc/mode.c
+++ b/drivers/video/tegra/dc/mode.c
@@ -26,6 +26,84 @@
 #include "dc_reg.h"
 #include "dc_priv.h"
 
+const struct fb_videomode tegra_modes[] = {
+	/* TouchRevolution Fusion 10" aka Chunghwa Picture Tubes
+	 * CLAA100NC05 10.1 inch 1024x600 single channel LVDS panel
+	 */
+	{
+		.name = "1024x600", .refresh = 60, .xres = 1024, .yres = 600,
+		.pixclock = 20833, .left_margin = 104, .right_margin = 43,
+		.upper_margin = 24, .lower_margin = 20,
+		.hsync_len = 5, .vsync_len = 5,
+		.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+		.flag = FB_FLAG_RATIO_16_9,
+		.vmode = FB_VMODE_NONINTERLACED
+	},
+	/* EDT 5.7" ET070080DH or TouchRevolution Fusion 7" */
+	{
+		.name = "800x480", .refresh = 60, .xres = 800, .yres = 480,
+		.pixclock = 30807, .left_margin = 128, .right_margin = 64,
+		.upper_margin = 22, .lower_margin = 20,
+		.hsync_len = 64, .vsync_len = 3,
+		.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+		.flag = FB_FLAG_RATIO_16_9,
+		.vmode = FB_VMODE_NONINTERLACED
+	},
+	/* Portrait modes */
+	{
+		.name = "480x640", .refresh = 60, .xres = 480, .yres = 640,
+		.pixclock = 55555, .left_margin = 20, .right_margin = 8,
+		.upper_margin = 7, .lower_margin = 8,
+		.hsync_len = 4, .vsync_len = 1,
+		.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+		.vmode = FB_VMODE_NONINTERLACED
+	},
+	{
+		.name = "540x960", .refresh = 60, .xres = 540, .yres = 960,
+		.pixclock = 100000, .left_margin = 32, .right_margin = 32,
+		.upper_margin = 1, .lower_margin = 2,
+		.hsync_len = 16, .vsync_len = 1,
+		.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+		.vmode = FB_VMODE_NONINTERLACED
+	},
+	{
+		.name = "720x1280", .refresh = 60, .xres = 720, .yres = 1280,
+		.pixclock = 16282, .left_margin = 100, .right_margin = 4,
+		.upper_margin = 14, .lower_margin = 4,
+		.hsync_len = 4, .vsync_len = 4,
+		.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+		.vmode = FB_VMODE_NONINTERLACED
+	},
+};
+
+/* try to find best matching mode using our modes, VESA and CEA modes from
+ * modedb
+ */
+int tegra_fb_find_mode(struct fb_var_screeninfo *var, struct fb_info *info,
+		       const char* option, unsigned int default_bpp)
+{
+	int out;
+
+	out = fb_find_mode(var, info, option, tegra_modes,
+			ARRAY_SIZE(tegra_modes), NULL, default_bpp);
+
+	/* Only accept this mode if we found a reasonable match (resolution) */
+	if (out == 1 || out == 2)
+		return out;
+
+	out = fb_find_mode(&info->var, info, option,
+			cea_modes, CEA_MODEDB_SIZE, NULL, default_bpp);
+
+	/* Check if we found a full match */
+	if (out == 1 || out == 2)
+		return out;
+
+	return fb_find_mode(&info->var, info, option,
+			vesa_modes, VESA_MODEDB_SIZE, NULL, default_bpp);
+}
+EXPORT_SYMBOL(tegra_fb_find_mode);
+
+
 /* return non-zero if constraint is violated */
 static int calc_h_ref_to_sync(const struct tegra_dc_mode *mode, int *href)
 {
diff --git a/drivers/video/tegra/fb.c b/drivers/video/tegra/fb.c
index 575f85ad9653..90d1363ecf9c 100644
--- a/drivers/video/tegra/fb.c
+++ b/drivers/video/tegra/fb.c
@@ -677,8 +677,11 @@ struct tegra_fb_info *tegra_fb_register(struct nvhost_device *ndev,
 
 	if (option != NULL)
 	{
-		if (!fb_find_mode(&info->var, info, option,
-				vesa_modes, VESA_MODEDB_SIZE, NULL, 16)) {
+		if (!strcmp(option, "off")) {
+			ret = -ENODEV;
+			goto err_iounmap_fb;
+		}
+		if (!tegra_fb_find_mode(&info->var, info, option, 16)) {
 			ret = -EINVAL;
 			goto err_iounmap_fb;
 		}
-- 
cgit v1.2.3