diff options
Diffstat (limited to 'drivers/gpu/drm/drm_edid.c')
| -rw-r--r-- | drivers/gpu/drm/drm_edid.c | 807 | 
1 files changed, 784 insertions, 23 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 51324256a65..c194f4e680a 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -29,11 +29,11 @@   */  #include <linux/kernel.h>  #include <linux/slab.h> +#include <linux/hdmi.h>  #include <linux/i2c.h>  #include <linux/module.h>  #include <drm/drmP.h>  #include <drm/drm_edid.h> -#include "drm_edid_modes.h"  #define version_greater(edid, maj, min) \  	(((edid)->version > (maj)) || \ @@ -127,6 +127,746 @@ static struct edid_quirk {  	{ "VSC", 5020, EDID_QUIRK_FORCE_REDUCED_BLANKING },  }; +/* + * Autogenerated from the DMT spec. + * This table is copied from xfree86/modes/xf86EdidModes.c. + */ +static const struct drm_display_mode drm_dmt_modes[] = { +	/* 640x350@85Hz */ +	{ DRM_MODE("640x350", DRM_MODE_TYPE_DRIVER, 31500, 640, 672, +		   736, 832, 0, 350, 382, 385, 445, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 640x400@85Hz */ +	{ DRM_MODE("640x400", DRM_MODE_TYPE_DRIVER, 31500, 640, 672, +		   736, 832, 0, 400, 401, 404, 445, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 720x400@85Hz */ +	{ DRM_MODE("720x400", DRM_MODE_TYPE_DRIVER, 35500, 720, 756, +		   828, 936, 0, 400, 401, 404, 446, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 640x480@60Hz */ +	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 25175, 640, 656, +		   752, 800, 0, 480, 489, 492, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 640x480@72Hz */ +	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 31500, 640, 664, +		   704, 832, 0, 480, 489, 492, 520, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 640x480@75Hz */ +	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 31500, 640, 656, +		   720, 840, 0, 480, 481, 484, 500, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 640x480@85Hz */ +	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 36000, 640, 696, +		   752, 832, 0, 480, 481, 484, 509, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 800x600@56Hz */ +	{ DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 36000, 800, 824, +		   896, 1024, 0, 600, 601, 603, 625, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 800x600@60Hz */ +	{ DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 40000, 800, 840, +		   968, 1056, 0, 600, 601, 605, 628, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 800x600@72Hz */ +	{ DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 50000, 800, 856, +		   976, 1040, 0, 600, 637, 643, 666, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 800x600@75Hz */ +	{ DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 49500, 800, 816, +		   896, 1056, 0, 600, 601, 604, 625, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 800x600@85Hz */ +	{ DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 56250, 800, 832, +		   896, 1048, 0, 600, 601, 604, 631, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 800x600@120Hz RB */ +	{ DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 73250, 800, 848, +		   880, 960, 0, 600, 603, 607, 636, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 848x480@60Hz */ +	{ DRM_MODE("848x480", DRM_MODE_TYPE_DRIVER, 33750, 848, 864, +		   976, 1088, 0, 480, 486, 494, 517, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1024x768@43Hz, interlace */ +	{ DRM_MODE("1024x768i", DRM_MODE_TYPE_DRIVER, 44900, 1024, 1032, +		   1208, 1264, 0, 768, 768, 772, 817, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC | +			DRM_MODE_FLAG_INTERLACE) }, +	/* 1024x768@60Hz */ +	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 65000, 1024, 1048, +		   1184, 1344, 0, 768, 771, 777, 806, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1024x768@70Hz */ +	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 75000, 1024, 1048, +		   1184, 1328, 0, 768, 771, 777, 806, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1024x768@75Hz */ +	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 78750, 1024, 1040, +		   1136, 1312, 0, 768, 769, 772, 800, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1024x768@85Hz */ +	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 94500, 1024, 1072, +		   1168, 1376, 0, 768, 769, 772, 808, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1024x768@120Hz RB */ +	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 115500, 1024, 1072, +		   1104, 1184, 0, 768, 771, 775, 813, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1152x864@75Hz */ +	{ DRM_MODE("1152x864", DRM_MODE_TYPE_DRIVER, 108000, 1152, 1216, +		   1344, 1600, 0, 864, 865, 868, 900, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1280x768@60Hz RB */ +	{ DRM_MODE("1280x768", DRM_MODE_TYPE_DRIVER, 68250, 1280, 1328, +		   1360, 1440, 0, 768, 771, 778, 790, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1280x768@60Hz */ +	{ DRM_MODE("1280x768", DRM_MODE_TYPE_DRIVER, 79500, 1280, 1344, +		   1472, 1664, 0, 768, 771, 778, 798, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1280x768@75Hz */ +	{ DRM_MODE("1280x768", DRM_MODE_TYPE_DRIVER, 102250, 1280, 1360, +		   1488, 1696, 0, 768, 771, 778, 805, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1280x768@85Hz */ +	{ DRM_MODE("1280x768", DRM_MODE_TYPE_DRIVER, 117500, 1280, 1360, +		   1496, 1712, 0, 768, 771, 778, 809, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1280x768@120Hz RB */ +	{ DRM_MODE("1280x768", DRM_MODE_TYPE_DRIVER, 140250, 1280, 1328, +		   1360, 1440, 0, 768, 771, 778, 813, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1280x800@60Hz RB */ +	{ DRM_MODE("1280x800", DRM_MODE_TYPE_DRIVER, 71000, 1280, 1328, +		   1360, 1440, 0, 800, 803, 809, 823, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1280x800@60Hz */ +	{ DRM_MODE("1280x800", DRM_MODE_TYPE_DRIVER, 83500, 1280, 1352, +		   1480, 1680, 0, 800, 803, 809, 831, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1280x800@75Hz */ +	{ DRM_MODE("1280x800", DRM_MODE_TYPE_DRIVER, 106500, 1280, 1360, +		   1488, 1696, 0, 800, 803, 809, 838, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1280x800@85Hz */ +	{ DRM_MODE("1280x800", DRM_MODE_TYPE_DRIVER, 122500, 1280, 1360, +		   1496, 1712, 0, 800, 803, 809, 843, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1280x800@120Hz RB */ +	{ DRM_MODE("1280x800", DRM_MODE_TYPE_DRIVER, 146250, 1280, 1328, +		   1360, 1440, 0, 800, 803, 809, 847, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1280x960@60Hz */ +	{ DRM_MODE("1280x960", DRM_MODE_TYPE_DRIVER, 108000, 1280, 1376, +		   1488, 1800, 0, 960, 961, 964, 1000, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1280x960@85Hz */ +	{ DRM_MODE("1280x960", DRM_MODE_TYPE_DRIVER, 148500, 1280, 1344, +		   1504, 1728, 0, 960, 961, 964, 1011, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1280x960@120Hz RB */ +	{ DRM_MODE("1280x960", DRM_MODE_TYPE_DRIVER, 175500, 1280, 1328, +		   1360, 1440, 0, 960, 963, 967, 1017, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1280x1024@60Hz */ +	{ DRM_MODE("1280x1024", DRM_MODE_TYPE_DRIVER, 108000, 1280, 1328, +		   1440, 1688, 0, 1024, 1025, 1028, 1066, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1280x1024@75Hz */ +	{ DRM_MODE("1280x1024", DRM_MODE_TYPE_DRIVER, 135000, 1280, 1296, +		   1440, 1688, 0, 1024, 1025, 1028, 1066, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1280x1024@85Hz */ +	{ DRM_MODE("1280x1024", DRM_MODE_TYPE_DRIVER, 157500, 1280, 1344, +		   1504, 1728, 0, 1024, 1025, 1028, 1072, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1280x1024@120Hz RB */ +	{ DRM_MODE("1280x1024", DRM_MODE_TYPE_DRIVER, 187250, 1280, 1328, +		   1360, 1440, 0, 1024, 1027, 1034, 1084, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1360x768@60Hz */ +	{ DRM_MODE("1360x768", DRM_MODE_TYPE_DRIVER, 85500, 1360, 1424, +		   1536, 1792, 0, 768, 771, 777, 795, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1360x768@120Hz RB */ +	{ DRM_MODE("1360x768", DRM_MODE_TYPE_DRIVER, 148250, 1360, 1408, +		   1440, 1520, 0, 768, 771, 776, 813, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1400x1050@60Hz RB */ +	{ DRM_MODE("1400x1050", DRM_MODE_TYPE_DRIVER, 101000, 1400, 1448, +		   1480, 1560, 0, 1050, 1053, 1057, 1080, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1400x1050@60Hz */ +	{ DRM_MODE("1400x1050", DRM_MODE_TYPE_DRIVER, 121750, 1400, 1488, +		   1632, 1864, 0, 1050, 1053, 1057, 1089, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1400x1050@75Hz */ +	{ DRM_MODE("1400x1050", DRM_MODE_TYPE_DRIVER, 156000, 1400, 1504, +		   1648, 1896, 0, 1050, 1053, 1057, 1099, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1400x1050@85Hz */ +	{ DRM_MODE("1400x1050", DRM_MODE_TYPE_DRIVER, 179500, 1400, 1504, +		   1656, 1912, 0, 1050, 1053, 1057, 1105, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1400x1050@120Hz RB */ +	{ DRM_MODE("1400x1050", DRM_MODE_TYPE_DRIVER, 208000, 1400, 1448, +		   1480, 1560, 0, 1050, 1053, 1057, 1112, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1440x900@60Hz RB */ +	{ DRM_MODE("1440x900", DRM_MODE_TYPE_DRIVER, 88750, 1440, 1488, +		   1520, 1600, 0, 900, 903, 909, 926, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1440x900@60Hz */ +	{ DRM_MODE("1440x900", DRM_MODE_TYPE_DRIVER, 106500, 1440, 1520, +		   1672, 1904, 0, 900, 903, 909, 934, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1440x900@75Hz */ +	{ DRM_MODE("1440x900", DRM_MODE_TYPE_DRIVER, 136750, 1440, 1536, +		   1688, 1936, 0, 900, 903, 909, 942, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1440x900@85Hz */ +	{ DRM_MODE("1440x900", DRM_MODE_TYPE_DRIVER, 157000, 1440, 1544, +		   1696, 1952, 0, 900, 903, 909, 948, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1440x900@120Hz RB */ +	{ DRM_MODE("1440x900", DRM_MODE_TYPE_DRIVER, 182750, 1440, 1488, +		   1520, 1600, 0, 900, 903, 909, 953, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1600x1200@60Hz */ +	{ DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 162000, 1600, 1664, +		   1856, 2160, 0, 1200, 1201, 1204, 1250, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1600x1200@65Hz */ +	{ DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 175500, 1600, 1664, +		   1856, 2160, 0, 1200, 1201, 1204, 1250, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1600x1200@70Hz */ +	{ DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 189000, 1600, 1664, +		   1856, 2160, 0, 1200, 1201, 1204, 1250, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1600x1200@75Hz */ +	{ DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 202500, 1600, 1664, +		   1856, 2160, 0, 1200, 1201, 1204, 1250, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1600x1200@85Hz */ +	{ DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 229500, 1600, 1664, +		   1856, 2160, 0, 1200, 1201, 1204, 1250, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1600x1200@120Hz RB */ +	{ DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 268250, 1600, 1648, +		   1680, 1760, 0, 1200, 1203, 1207, 1271, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1680x1050@60Hz RB */ +	{ DRM_MODE("1680x1050", DRM_MODE_TYPE_DRIVER, 119000, 1680, 1728, +		   1760, 1840, 0, 1050, 1053, 1059, 1080, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1680x1050@60Hz */ +	{ DRM_MODE("1680x1050", DRM_MODE_TYPE_DRIVER, 146250, 1680, 1784, +		   1960, 2240, 0, 1050, 1053, 1059, 1089, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1680x1050@75Hz */ +	{ DRM_MODE("1680x1050", DRM_MODE_TYPE_DRIVER, 187000, 1680, 1800, +		   1976, 2272, 0, 1050, 1053, 1059, 1099, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1680x1050@85Hz */ +	{ DRM_MODE("1680x1050", DRM_MODE_TYPE_DRIVER, 214750, 1680, 1808, +		   1984, 2288, 0, 1050, 1053, 1059, 1105, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1680x1050@120Hz RB */ +	{ DRM_MODE("1680x1050", DRM_MODE_TYPE_DRIVER, 245500, 1680, 1728, +		   1760, 1840, 0, 1050, 1053, 1059, 1112, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1792x1344@60Hz */ +	{ DRM_MODE("1792x1344", DRM_MODE_TYPE_DRIVER, 204750, 1792, 1920, +		   2120, 2448, 0, 1344, 1345, 1348, 1394, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1792x1344@75Hz */ +	{ DRM_MODE("1792x1344", DRM_MODE_TYPE_DRIVER, 261000, 1792, 1888, +		   2104, 2456, 0, 1344, 1345, 1348, 1417, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1792x1344@120Hz RB */ +	{ DRM_MODE("1792x1344", DRM_MODE_TYPE_DRIVER, 333250, 1792, 1840, +		   1872, 1952, 0, 1344, 1347, 1351, 1423, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1856x1392@60Hz */ +	{ DRM_MODE("1856x1392", DRM_MODE_TYPE_DRIVER, 218250, 1856, 1952, +		   2176, 2528, 0, 1392, 1393, 1396, 1439, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1856x1392@75Hz */ +	{ DRM_MODE("1856x1392", DRM_MODE_TYPE_DRIVER, 288000, 1856, 1984, +		   2208, 2560, 0, 1392, 1395, 1399, 1500, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1856x1392@120Hz RB */ +	{ DRM_MODE("1856x1392", DRM_MODE_TYPE_DRIVER, 356500, 1856, 1904, +		   1936, 2016, 0, 1392, 1395, 1399, 1474, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1920x1200@60Hz RB */ +	{ DRM_MODE("1920x1200", DRM_MODE_TYPE_DRIVER, 154000, 1920, 1968, +		   2000, 2080, 0, 1200, 1203, 1209, 1235, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1920x1200@60Hz */ +	{ DRM_MODE("1920x1200", DRM_MODE_TYPE_DRIVER, 193250, 1920, 2056, +		   2256, 2592, 0, 1200, 1203, 1209, 1245, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1920x1200@75Hz */ +	{ DRM_MODE("1920x1200", DRM_MODE_TYPE_DRIVER, 245250, 1920, 2056, +		   2264, 2608, 0, 1200, 1203, 1209, 1255, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1920x1200@85Hz */ +	{ DRM_MODE("1920x1200", DRM_MODE_TYPE_DRIVER, 281250, 1920, 2064, +		   2272, 2624, 0, 1200, 1203, 1209, 1262, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1920x1200@120Hz RB */ +	{ DRM_MODE("1920x1200", DRM_MODE_TYPE_DRIVER, 317000, 1920, 1968, +		   2000, 2080, 0, 1200, 1203, 1209, 1271, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 1920x1440@60Hz */ +	{ DRM_MODE("1920x1440", DRM_MODE_TYPE_DRIVER, 234000, 1920, 2048, +		   2256, 2600, 0, 1440, 1441, 1444, 1500, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1920x1440@75Hz */ +	{ DRM_MODE("1920x1440", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2064, +		   2288, 2640, 0, 1440, 1441, 1444, 1500, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 1920x1440@120Hz RB */ +	{ DRM_MODE("1920x1440", DRM_MODE_TYPE_DRIVER, 380500, 1920, 1968, +		   2000, 2080, 0, 1440, 1443, 1447, 1525, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 2560x1600@60Hz RB */ +	{ DRM_MODE("2560x1600", DRM_MODE_TYPE_DRIVER, 268500, 2560, 2608, +		   2640, 2720, 0, 1600, 1603, 1609, 1646, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 2560x1600@60Hz */ +	{ DRM_MODE("2560x1600", DRM_MODE_TYPE_DRIVER, 348500, 2560, 2752, +		   3032, 3504, 0, 1600, 1603, 1609, 1658, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 2560x1600@75HZ */ +	{ DRM_MODE("2560x1600", DRM_MODE_TYPE_DRIVER, 443250, 2560, 2768, +		   3048, 3536, 0, 1600, 1603, 1609, 1672, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 2560x1600@85HZ */ +	{ DRM_MODE("2560x1600", DRM_MODE_TYPE_DRIVER, 505250, 2560, 2768, +		   3048, 3536, 0, 1600, 1603, 1609, 1682, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 2560x1600@120Hz RB */ +	{ DRM_MODE("2560x1600", DRM_MODE_TYPE_DRIVER, 552750, 2560, 2608, +		   2640, 2720, 0, 1600, 1603, 1609, 1694, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC) }, +}; + +static const struct drm_display_mode edid_est_modes[] = { +	{ DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 40000, 800, 840, +		   968, 1056, 0, 600, 601, 605, 628, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, /* 800x600@60Hz */ +	{ DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 36000, 800, 824, +		   896, 1024, 0, 600, 601, 603,  625, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, /* 800x600@56Hz */ +	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 31500, 640, 656, +		   720, 840, 0, 480, 481, 484, 500, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, /* 640x480@75Hz */ +	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 31500, 640, 664, +		   704,  832, 0, 480, 489, 491, 520, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, /* 640x480@72Hz */ +	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 30240, 640, 704, +		   768,  864, 0, 480, 483, 486, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, /* 640x480@67Hz */ +	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 25200, 640, 656, +		   752, 800, 0, 480, 490, 492, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, /* 640x480@60Hz */ +	{ DRM_MODE("720x400", DRM_MODE_TYPE_DRIVER, 35500, 720, 738, +		   846, 900, 0, 400, 421, 423,  449, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, /* 720x400@88Hz */ +	{ DRM_MODE("720x400", DRM_MODE_TYPE_DRIVER, 28320, 720, 738, +		   846,  900, 0, 400, 412, 414, 449, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }, /* 720x400@70Hz */ +	{ DRM_MODE("1280x1024", DRM_MODE_TYPE_DRIVER, 135000, 1280, 1296, +		   1440, 1688, 0, 1024, 1025, 1028, 1066, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, /* 1280x1024@75Hz */ +	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 78800, 1024, 1040, +		   1136, 1312, 0,  768, 769, 772, 800, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, /* 1024x768@75Hz */ +	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 75000, 1024, 1048, +		   1184, 1328, 0,  768, 771, 777, 806, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, /* 1024x768@70Hz */ +	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 65000, 1024, 1048, +		   1184, 1344, 0,  768, 771, 777, 806, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, /* 1024x768@60Hz */ +	{ DRM_MODE("1024x768i", DRM_MODE_TYPE_DRIVER,44900, 1024, 1032, +		   1208, 1264, 0, 768, 768, 776, 817, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC | DRM_MODE_FLAG_INTERLACE) }, /* 1024x768@43Hz */ +	{ DRM_MODE("832x624", DRM_MODE_TYPE_DRIVER, 57284, 832, 864, +		   928, 1152, 0, 624, 625, 628, 667, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, /* 832x624@75Hz */ +	{ DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 49500, 800, 816, +		   896, 1056, 0, 600, 601, 604,  625, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, /* 800x600@75Hz */ +	{ DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 50000, 800, 856, +		   976, 1040, 0, 600, 637, 643, 666, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, /* 800x600@72Hz */ +	{ DRM_MODE("1152x864", DRM_MODE_TYPE_DRIVER, 108000, 1152, 1216, +		   1344, 1600, 0,  864, 865, 868, 900, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, /* 1152x864@75Hz */ +}; + +struct minimode { +	short w; +	short h; +	short r; +	short rb; +}; + +static const struct minimode est3_modes[] = { +	/* byte 6 */ +	{ 640, 350, 85, 0 }, +	{ 640, 400, 85, 0 }, +	{ 720, 400, 85, 0 }, +	{ 640, 480, 85, 0 }, +	{ 848, 480, 60, 0 }, +	{ 800, 600, 85, 0 }, +	{ 1024, 768, 85, 0 }, +	{ 1152, 864, 75, 0 }, +	/* byte 7 */ +	{ 1280, 768, 60, 1 }, +	{ 1280, 768, 60, 0 }, +	{ 1280, 768, 75, 0 }, +	{ 1280, 768, 85, 0 }, +	{ 1280, 960, 60, 0 }, +	{ 1280, 960, 85, 0 }, +	{ 1280, 1024, 60, 0 }, +	{ 1280, 1024, 85, 0 }, +	/* byte 8 */ +	{ 1360, 768, 60, 0 }, +	{ 1440, 900, 60, 1 }, +	{ 1440, 900, 60, 0 }, +	{ 1440, 900, 75, 0 }, +	{ 1440, 900, 85, 0 }, +	{ 1400, 1050, 60, 1 }, +	{ 1400, 1050, 60, 0 }, +	{ 1400, 1050, 75, 0 }, +	/* byte 9 */ +	{ 1400, 1050, 85, 0 }, +	{ 1680, 1050, 60, 1 }, +	{ 1680, 1050, 60, 0 }, +	{ 1680, 1050, 75, 0 }, +	{ 1680, 1050, 85, 0 }, +	{ 1600, 1200, 60, 0 }, +	{ 1600, 1200, 65, 0 }, +	{ 1600, 1200, 70, 0 }, +	/* byte 10 */ +	{ 1600, 1200, 75, 0 }, +	{ 1600, 1200, 85, 0 }, +	{ 1792, 1344, 60, 0 }, +	{ 1792, 1344, 85, 0 }, +	{ 1856, 1392, 60, 0 }, +	{ 1856, 1392, 75, 0 }, +	{ 1920, 1200, 60, 1 }, +	{ 1920, 1200, 60, 0 }, +	/* byte 11 */ +	{ 1920, 1200, 75, 0 }, +	{ 1920, 1200, 85, 0 }, +	{ 1920, 1440, 60, 0 }, +	{ 1920, 1440, 75, 0 }, +}; + +static const struct minimode extra_modes[] = { +	{ 1024, 576,  60, 0 }, +	{ 1366, 768,  60, 0 }, +	{ 1600, 900,  60, 0 }, +	{ 1680, 945,  60, 0 }, +	{ 1920, 1080, 60, 0 }, +	{ 2048, 1152, 60, 0 }, +	{ 2048, 1536, 60, 0 }, +}; + +/* + * Probably taken from CEA-861 spec. + * This table is converted from xorg's hw/xfree86/modes/xf86EdidModes.c. + */ +static const struct drm_display_mode edid_cea_modes[] = { +	/* 1 - 640x480@60Hz */ +	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 25175, 640, 656, +		   752, 800, 0, 480, 490, 492, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 2 - 720x480@60Hz */ +	{ DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 27000, 720, 736, +		   798, 858, 0, 480, 489, 495, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 3 - 720x480@60Hz */ +	{ DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 27000, 720, 736, +		   798, 858, 0, 480, 489, 495, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 4 - 1280x720@60Hz */ +	{ DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 1390, +		   1430, 1650, 0, 720, 725, 730, 750, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 5 - 1920x1080i@60Hz */ +	{ DRM_MODE("1920x1080i", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2008, +		   2052, 2200, 0, 1080, 1084, 1094, 1125, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC | +			DRM_MODE_FLAG_INTERLACE) }, +	/* 6 - 1440x480i@60Hz */ +	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478, +		   1602, 1716, 0, 480, 488, 494, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) }, +	/* 7 - 1440x480i@60Hz */ +	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478, +		   1602, 1716, 0, 480, 488, 494, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) }, +	/* 8 - 1440x240@60Hz */ +	{ DRM_MODE("1440x240", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478, +		   1602, 1716, 0, 240, 244, 247, 262, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_DBLCLK) }, +	/* 9 - 1440x240@60Hz */ +	{ DRM_MODE("1440x240", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478, +		   1602, 1716, 0, 240, 244, 247, 262, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_DBLCLK) }, +	/* 10 - 2880x480i@60Hz */ +	{ DRM_MODE("2880x480i", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956, +		   3204, 3432, 0, 480, 488, 494, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_INTERLACE) }, +	/* 11 - 2880x480i@60Hz */ +	{ DRM_MODE("2880x480i", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956, +		   3204, 3432, 0, 480, 488, 494, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_INTERLACE) }, +	/* 12 - 2880x240@60Hz */ +	{ DRM_MODE("2880x240", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956, +		   3204, 3432, 0, 240, 244, 247, 262, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 13 - 2880x240@60Hz */ +	{ DRM_MODE("2880x240", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956, +		   3204, 3432, 0, 240, 244, 247, 262, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 14 - 1440x480@60Hz */ +	{ DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1472, +		   1596, 1716, 0, 480, 489, 495, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 15 - 1440x480@60Hz */ +	{ DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1472, +		   1596, 1716, 0, 480, 489, 495, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 16 - 1920x1080@60Hz */ +	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2008, +		   2052, 2200, 0, 1080, 1084, 1089, 1125, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 17 - 720x576@50Hz */ +	{ DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 27000, 720, 732, +		   796, 864, 0, 576, 581, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 18 - 720x576@50Hz */ +	{ DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 27000, 720, 732, +		   796, 864, 0, 576, 581, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 19 - 1280x720@50Hz */ +	{ DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 1720, +		   1760, 1980, 0, 720, 725, 730, 750, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 20 - 1920x1080i@50Hz */ +	{ DRM_MODE("1920x1080i", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2448, +		   2492, 2640, 0, 1080, 1084, 1094, 1125, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC | +			DRM_MODE_FLAG_INTERLACE) }, +	/* 21 - 1440x576i@50Hz */ +	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464, +		   1590, 1728, 0, 576, 580, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) }, +	/* 22 - 1440x576i@50Hz */ +	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464, +		   1590, 1728, 0, 576, 580, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) }, +	/* 23 - 1440x288@50Hz */ +	{ DRM_MODE("1440x288", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464, +		   1590, 1728, 0, 288, 290, 293, 312, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_DBLCLK) }, +	/* 24 - 1440x288@50Hz */ +	{ DRM_MODE("1440x288", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464, +		   1590, 1728, 0, 288, 290, 293, 312, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_DBLCLK) }, +	/* 25 - 2880x576i@50Hz */ +	{ DRM_MODE("2880x576i", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928, +		   3180, 3456, 0, 576, 580, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_INTERLACE) }, +	/* 26 - 2880x576i@50Hz */ +	{ DRM_MODE("2880x576i", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928, +		   3180, 3456, 0, 576, 580, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_INTERLACE) }, +	/* 27 - 2880x288@50Hz */ +	{ DRM_MODE("2880x288", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928, +		   3180, 3456, 0, 288, 290, 293, 312, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 28 - 2880x288@50Hz */ +	{ DRM_MODE("2880x288", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928, +		   3180, 3456, 0, 288, 290, 293, 312, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 29 - 1440x576@50Hz */ +	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464, +		   1592, 1728, 0, 576, 581, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 30 - 1440x576@50Hz */ +	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464, +		   1592, 1728, 0, 576, 581, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 31 - 1920x1080@50Hz */ +	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2448, +		   2492, 2640, 0, 1080, 1084, 1089, 1125, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 32 - 1920x1080@24Hz */ +	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2558, +		   2602, 2750, 0, 1080, 1084, 1089, 1125, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 33 - 1920x1080@25Hz */ +	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2448, +		   2492, 2640, 0, 1080, 1084, 1089, 1125, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 34 - 1920x1080@30Hz */ +	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2008, +		   2052, 2200, 0, 1080, 1084, 1089, 1125, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 35 - 2880x480@60Hz */ +	{ DRM_MODE("2880x480", DRM_MODE_TYPE_DRIVER, 108000, 2880, 2944, +		   3192, 3432, 0, 480, 489, 495, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 36 - 2880x480@60Hz */ +	{ DRM_MODE("2880x480", DRM_MODE_TYPE_DRIVER, 108000, 2880, 2944, +		   3192, 3432, 0, 480, 489, 495, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 37 - 2880x576@50Hz */ +	{ DRM_MODE("2880x576", DRM_MODE_TYPE_DRIVER, 108000, 2880, 2928, +		   3184, 3456, 0, 576, 581, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 38 - 2880x576@50Hz */ +	{ DRM_MODE("2880x576", DRM_MODE_TYPE_DRIVER, 108000, 2880, 2928, +		   3184, 3456, 0, 576, 581, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 39 - 1920x1080i@50Hz */ +	{ DRM_MODE("1920x1080i", DRM_MODE_TYPE_DRIVER, 72000, 1920, 1952, +		   2120, 2304, 0, 1080, 1126, 1136, 1250, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_INTERLACE) }, +	/* 40 - 1920x1080i@100Hz */ +	{ DRM_MODE("1920x1080i", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2448, +		   2492, 2640, 0, 1080, 1084, 1094, 1125, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC | +			DRM_MODE_FLAG_INTERLACE) }, +	/* 41 - 1280x720@100Hz */ +	{ DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 148500, 1280, 1720, +		   1760, 1980, 0, 720, 725, 730, 750, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 42 - 720x576@100Hz */ +	{ DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 54000, 720, 732, +		   796, 864, 0, 576, 581, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 43 - 720x576@100Hz */ +	{ DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 54000, 720, 732, +		   796, 864, 0, 576, 581, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 44 - 1440x576i@100Hz */ +	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464, +		   1590, 1728, 0, 576, 580, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_DBLCLK) }, +	/* 45 - 1440x576i@100Hz */ +	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464, +		   1590, 1728, 0, 576, 580, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_DBLCLK) }, +	/* 46 - 1920x1080i@120Hz */ +	{ DRM_MODE("1920x1080i", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2008, +		   2052, 2200, 0, 1080, 1084, 1094, 1125, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC | +			DRM_MODE_FLAG_INTERLACE) }, +	/* 47 - 1280x720@120Hz */ +	{ DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 148500, 1280, 1390, +		   1430, 1650, 0, 720, 725, 730, 750, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 48 - 720x480@120Hz */ +	{ DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 54000, 720, 736, +		   798, 858, 0, 480, 489, 495, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 49 - 720x480@120Hz */ +	{ DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 54000, 720, 736, +		   798, 858, 0, 480, 489, 495, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 50 - 1440x480i@120Hz */ +	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478, +		   1602, 1716, 0, 480, 488, 494, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) }, +	/* 51 - 1440x480i@120Hz */ +	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478, +		   1602, 1716, 0, 480, 488, 494, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) }, +	/* 52 - 720x576@200Hz */ +	{ DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 108000, 720, 732, +		   796, 864, 0, 576, 581, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 53 - 720x576@200Hz */ +	{ DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 108000, 720, 732, +		   796, 864, 0, 576, 581, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 54 - 1440x576i@200Hz */ +	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464, +		   1590, 1728, 0, 576, 580, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) }, +	/* 55 - 1440x576i@200Hz */ +	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464, +		   1590, 1728, 0, 576, 580, 586, 625, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) }, +	/* 56 - 720x480@240Hz */ +	{ DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 108000, 720, 736, +		   798, 858, 0, 480, 489, 495, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 57 - 720x480@240Hz */ +	{ DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 108000, 720, 736, +		   798, 858, 0, 480, 489, 495, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, +	/* 58 - 1440x480i@240 */ +	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478, +		   1602, 1716, 0, 480, 488, 494, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) }, +	/* 59 - 1440x480i@240 */ +	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478, +		   1602, 1716, 0, 480, 488, 494, 525, 0, +		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | +			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) }, +	/* 60 - 1280x720@24Hz */ +	{ DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 59400, 1280, 3040, +		   3080, 3300, 0, 720, 725, 730, 750, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 61 - 1280x720@25Hz */ +	{ DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 3700, +		   3740, 3960, 0, 720, 725, 730, 750, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 62 - 1280x720@30Hz */ +	{ DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 3040, +		   3080, 3300, 0, 720, 725, 730, 750, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 63 - 1920x1080@120Hz */ +	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2008, +		   2052, 2200, 0, 1080, 1084, 1089, 1125, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +	/* 64 - 1920x1080@100Hz */ +	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2448, +		   2492, 2640, 0, 1080, 1084, 1094, 1125, 0, +		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, +}; +  /*** DDC fetch and block validation ***/  static const u8 edid_header[] = { @@ -354,10 +1094,14 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)  				break;  			}  		} -		if (i == 4) + +		if (i == 4 && print_bad_edid) {  			dev_warn(connector->dev->dev,  			 "%s: Ignoring invalid EDID block %d.\n",  			 drm_get_connector_name(connector), j); + +			connector->bad_edid_counter++; +		}  	}  	if (valid_extensions != block[0x7e]) { @@ -538,7 +1282,7 @@ struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev,  {  	int i; -	for (i = 0; i < drm_num_dmt_modes; i++) { +	for (i = 0; i < ARRAY_SIZE(drm_dmt_modes); i++) {  		const struct drm_display_mode *ptr = &drm_dmt_modes[i];  		if (hsize != ptr->hdisplay)  			continue; @@ -1079,7 +1823,7 @@ drm_dmt_modes_for_range(struct drm_connector *connector, struct edid *edid,  	struct drm_display_mode *newmode;  	struct drm_device *dev = connector->dev; -	for (i = 0; i < drm_num_dmt_modes; i++) { +	for (i = 0; i < ARRAY_SIZE(drm_dmt_modes); i++) {  		if (mode_in_range(drm_dmt_modes + i, edid, timing) &&  		    valid_inferred_mode(connector, drm_dmt_modes + i)) {  			newmode = drm_mode_duplicate(dev, &drm_dmt_modes[i]); @@ -1114,7 +1858,7 @@ drm_gtf_modes_for_range(struct drm_connector *connector, struct edid *edid,  	struct drm_display_mode *newmode;  	struct drm_device *dev = connector->dev; -	for (i = 0; i < num_extra_modes; i++) { +	for (i = 0; i < ARRAY_SIZE(extra_modes); i++) {  		const struct minimode *m = &extra_modes[i];  		newmode = drm_gtf_mode(dev, m->w, m->h, m->r, 0, 0);  		if (!newmode) @@ -1143,7 +1887,7 @@ drm_cvt_modes_for_range(struct drm_connector *connector, struct edid *edid,  	struct drm_device *dev = connector->dev;  	bool rb = drm_monitor_supports_rb(edid); -	for (i = 0; i < num_extra_modes; i++) { +	for (i = 0; i < ARRAY_SIZE(extra_modes); i++) {  		const struct minimode *m = &extra_modes[i];  		newmode = drm_cvt_mode(dev, m->w, m->h, m->r, rb, 0, 0);  		if (!newmode) @@ -1512,16 +2256,19 @@ u8 *drm_find_cea_extension(struct edid *edid)  }  EXPORT_SYMBOL(drm_find_cea_extension); -/* - * Looks for a CEA mode matching given drm_display_mode. - * Returns its CEA Video ID code, or 0 if not found. +/** + * drm_match_cea_mode - look for a CEA mode matching given mode + * @to_match: display mode + * + * Returns the CEA Video ID (VIC) of the mode or 0 if it isn't a CEA-861 + * mode.   */ -u8 drm_match_cea_mode(struct drm_display_mode *to_match) +u8 drm_match_cea_mode(const struct drm_display_mode *to_match)  {  	struct drm_display_mode *cea_mode;  	u8 mode; -	for (mode = 0; mode < drm_num_cea_modes; mode++) { +	for (mode = 0; mode < ARRAY_SIZE(edid_cea_modes); mode++) {  		cea_mode = (struct drm_display_mode *)&edid_cea_modes[mode];  		if (drm_mode_equal(to_match, cea_mode)) @@ -1541,7 +2288,7 @@ do_cea_modes (struct drm_connector *connector, u8 *db, u8 len)  	for (mode = db; mode < db + len; mode++) {  		cea_mode = (*mode & 127) - 1; /* CEA modes are numbered 1..127 */ -		if (cea_mode < drm_num_cea_modes) { +		if (cea_mode < ARRAY_SIZE(edid_cea_modes)) {  			struct drm_display_mode *newmode;  			newmode = drm_mode_duplicate(dev,  						     &edid_cea_modes[cea_mode]); @@ -2050,7 +2797,8 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)  	num_modes += add_cvt_modes(connector, edid);  	num_modes += add_standard_modes(connector, edid);  	num_modes += add_established_modes(connector, edid); -	num_modes += add_inferred_modes(connector, edid); +	if (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF) +		num_modes += add_inferred_modes(connector, edid);  	num_modes += add_cea_modes(connector, edid);  	if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75)) @@ -2111,20 +2859,33 @@ int drm_add_modes_noedid(struct drm_connector *connector,  EXPORT_SYMBOL(drm_add_modes_noedid);  /** - * drm_mode_cea_vic - return the CEA-861 VIC of a given mode - * @mode: mode + * drm_hdmi_avi_infoframe_from_display_mode() - fill an HDMI AVI infoframe with + *                                              data from a DRM display mode + * @frame: HDMI AVI infoframe + * @mode: DRM display mode   * - * RETURNS: - * The VIC number, 0 in case it's not a CEA-861 mode. + * Returns 0 on success or a negative error code on failure.   */ -uint8_t drm_mode_cea_vic(const struct drm_display_mode *mode) +int +drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame, +					 const struct drm_display_mode *mode)  { -	uint8_t i; +	int err; + +	if (!frame || !mode) +		return -EINVAL; + +	err = hdmi_avi_infoframe_init(frame); +	if (err < 0) +		return err; + +	frame->video_code = drm_match_cea_mode(mode); +	if (!frame->video_code) +		return 0; -	for (i = 0; i < drm_num_cea_modes; i++) -		if (drm_mode_equal(mode, &edid_cea_modes[i])) -			return i + 1; +	frame->picture_aspect = HDMI_PICTURE_ASPECT_NONE; +	frame->active_aspect = HDMI_ACTIVE_ASPECT_PICTURE;  	return 0;  } -EXPORT_SYMBOL(drm_mode_cea_vic); +EXPORT_SYMBOL(drm_hdmi_avi_infoframe_from_display_mode);  |