Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
- index c194f4e..75f1f38 100644
- --- a/drivers/gpu/drm/drm_edid.c
- +++ b/drivers/gpu/drm/drm_edid.c
- @@ -88,44 +88,48 @@ static struct edid_quirk {
- u32 quirks;
- } edid_quirk_list[] = {
- /* Acer AL1706 */
- - { "ACR", 44358, EDID_QUIRK_PREFER_LARGE_60 },
- - /* Acer F51 */
- - { "API", 0x7602, EDID_QUIRK_PREFER_LARGE_60 },
- - /* Unknown Acer */
- - { "ACR", 2423, EDID_QUIRK_FIRST_DETAILED_PREFERRED },
- -
- - /* Belinea 10 15 55 */
- - { "MAX", 1516, EDID_QUIRK_PREFER_LARGE_60 },
- - { "MAX", 0x77e, EDID_QUIRK_PREFER_LARGE_60 },
- -
- - /* Envision Peripherals, Inc. EN-7100e */
- - { "EPI", 59264, EDID_QUIRK_135_CLOCK_TOO_HIGH },
- - /* Envision EN2028 */
- - { "EPI", 8232, EDID_QUIRK_PREFER_LARGE_60 },
- -
- - /* Funai Electronics PM36B */
- - { "FCM", 13600, EDID_QUIRK_PREFER_LARGE_75 |
- - EDID_QUIRK_DETAILED_IN_CM },
- -
- - /* LG Philips LCD LP154W01-A5 */
- - { "LPL", 0, EDID_QUIRK_DETAILED_USE_MAXIMUM_SIZE },
- - { "LPL", 0x2a00, EDID_QUIRK_DETAILED_USE_MAXIMUM_SIZE },
- -
- - /* Philips 107p5 CRT */
- - { "PHL", 57364, EDID_QUIRK_FIRST_DETAILED_PREFERRED },
- -
- - /* Proview AY765C */
- - { "PTS", 765, EDID_QUIRK_FIRST_DETAILED_PREFERRED },
- -
- - /* Samsung SyncMaster 205BW. Note: irony */
- - { "SAM", 541, EDID_QUIRK_DETAILED_SYNC_PP },
- - /* Samsung SyncMaster 22[5-6]BW */
- - { "SAM", 596, EDID_QUIRK_PREFER_LARGE_60 },
- - { "SAM", 638, EDID_QUIRK_PREFER_LARGE_60 },
- -
- - /* ViewSonic VA2026w */
- - { "VSC", 5020, EDID_QUIRK_FORCE_REDUCED_BLANKING },
- -};
- + {
- + "ACR", 44358, EDID_QUIRK_PREFER_LARGE_60},
- + /* Acer F51 */
- + {
- + "API", 0x7602, EDID_QUIRK_PREFER_LARGE_60},
- + /* Unknown Acer */
- + {
- + "ACR", 2423, EDID_QUIRK_FIRST_DETAILED_PREFERRED},
- + /* Belinea 10 15 55 */
- + {
- + "MAX", 1516, EDID_QUIRK_PREFER_LARGE_60}, {
- + "MAX", 0x77e, EDID_QUIRK_PREFER_LARGE_60},
- + /* Envision Peripherals, Inc. EN-7100e */
- + {
- + "EPI", 59264, EDID_QUIRK_135_CLOCK_TOO_HIGH},
- + /* Envision EN2028 */
- + {
- + "EPI", 8232, EDID_QUIRK_PREFER_LARGE_60},
- + /* Funai Electronics PM36B */
- + {
- + "FCM", 13600, EDID_QUIRK_PREFER_LARGE_75 |
- + EDID_QUIRK_DETAILED_IN_CM},
- + /* LG Philips LCD LP154W01-A5 */
- + {
- + "LPL", 0, EDID_QUIRK_DETAILED_USE_MAXIMUM_SIZE}, {
- + "LPL", 0x2a00, EDID_QUIRK_DETAILED_USE_MAXIMUM_SIZE},
- + /* Philips 107p5 CRT */
- + {
- + "PHL", 57364, EDID_QUIRK_FIRST_DETAILED_PREFERRED},
- + /* Proview AY765C */
- + {
- + "PTS", 765, EDID_QUIRK_FIRST_DETAILED_PREFERRED},
- + /* Samsung SyncMaster 205BW. Note: irony */
- + {
- + "SAM", 541, EDID_QUIRK_DETAILED_SYNC_PP},
- + /* Samsung SyncMaster 22[5-6]BW */
- + {
- + "SAM", 596, EDID_QUIRK_PREFER_LARGE_60}, {
- + "SAM", 638, EDID_QUIRK_PREFER_LARGE_60},
- + /* ViewSonic VA2026w */
- + {
- +"VSC", 5020, EDID_QUIRK_FORCE_REDUCED_BLANKING},};
- /*
- * Autogenerated from the DMT spec.
- @@ -133,380 +137,380 @@ static struct edid_quirk {
- */
- 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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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 */
- + {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 {
- @@ -518,65 +522,65 @@ struct minimode {
- 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 },
- + {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 },
- + {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 },
- + {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 },
- + {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 },
- + {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 },
- + {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 },
- + {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},
- };
- /*
- @@ -585,286 +589,286 @@ static const struct minimode extra_modes[] = {
- */
- 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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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) },
- + {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 ***/
- @@ -874,10 +878,10 @@ static const u8 edid_header[] = {
- };
- /*
- - * Sanity check the header of the base EDID block. Return 8 if the header
- - * is perfect, down to 0 if it's totally wrong.
- - */
- -int drm_edid_header_is_valid(const u8 *raw_edid)
- + * Sanity check the header of the base EDID block. Return 8 if the header
- + * is perfect, down to 0 if it's totally wrong.
- + */
- +int drm_edid_header_is_valid(const u8 * raw_edid)
- {
- int i, score = 0;
- @@ -887,6 +891,7 @@ int drm_edid_header_is_valid(const u8 *raw_edid)
- return score;
- }
- +
- EXPORT_SYMBOL(drm_edid_header_is_valid);
- static int edid_fixup __read_mostly = 6;
- @@ -898,7 +903,7 @@ MODULE_PARM_DESC(edid_fixup,
- * Sanity check the EDID block (base or extension). Return 0 if the block
- * doesn't check out, or 1 if it's valid.
- */
- -bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid)
- +bool drm_edid_block_valid(u8 * raw_edid, int block, bool print_bad_edid)
- {
- int i;
- u8 csum = 0;
- @@ -911,7 +916,8 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid)
- int score = drm_edid_header_is_valid(raw_edid);
- if (score == 8) ;
- else if (score >= edid_fixup) {
- - DRM_DEBUG("Fixing EDID header, your hardware may be failing\n");
- + DRM_DEBUG
- + ("Fixing EDID header, your hardware may be failing\n");
- memcpy(raw_edid, edid_header, sizeof(edid_header));
- } else {
- goto bad;
- @@ -922,7 +928,8 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid)
- csum += raw_edid[i];
- if (csum) {
- if (print_bad_edid) {
- - DRM_ERROR("EDID checksum is invalid, remainder is %d\n", csum);
- + DRM_ERROR("EDID checksum is invalid, remainder is %d\n",
- + csum);
- }
- /* allow CEA to slide through, switches mangle this */
- @@ -932,14 +939,16 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid)
- /* per-block-type checks */
- switch (raw_edid[0]) {
- - case 0: /* base */
- + case 0: /* base */
- if (edid->version != 1) {
- - DRM_ERROR("EDID has major version %d, instead of 1\n", edid->version);
- + DRM_ERROR("EDID has major version %d, instead of 1\n",
- + edid->version);
- goto bad;
- }
- if (edid->revision > 4)
- - DRM_DEBUG("EDID minor > 4, assuming backward compatibility\n");
- + DRM_DEBUG
- + ("EDID minor > 4, assuming backward compatibility\n");
- break;
- default:
- @@ -956,6 +965,7 @@ bad:
- }
- return 0;
- }
- +
- EXPORT_SYMBOL(drm_edid_block_valid);
- /**
- @@ -964,10 +974,10 @@ EXPORT_SYMBOL(drm_edid_block_valid);
- *
- * Sanity-check an entire EDID record (including extensions)
- */
- -bool drm_edid_is_valid(struct edid *edid)
- +bool drm_edid_is_valid(struct edid * edid)
- {
- int i;
- - u8 *raw = (u8 *)edid;
- + u8 *raw = (u8 *) edid;
- if (!edid)
- return false;
- @@ -978,6 +988,7 @@ bool drm_edid_is_valid(struct edid *edid)
- return true;
- }
- +
- EXPORT_SYMBOL(drm_edid_is_valid);
- #define DDC_SEGMENT_ADDR 0x30
- @@ -1009,32 +1020,32 @@ drm_do_probe_ddc_edid(struct i2c_adapter *adapter, unsigned char *buf,
- do {
- struct i2c_msg msgs[] = {
- {
- - .addr = DDC_SEGMENT_ADDR,
- - .flags = 0,
- - .len = 1,
- - .buf = &segment,
- - }, {
- - .addr = DDC_ADDR,
- - .flags = 0,
- - .len = 1,
- - .buf = &start,
- - }, {
- - .addr = DDC_ADDR,
- - .flags = I2C_M_RD,
- - .len = len,
- - .buf = buf,
- - }
- + .addr = DDC_SEGMENT_ADDR,
- + .flags = 0,
- + .len = 1,
- + .buf = &segment,
- + }, {
- + .addr = DDC_ADDR,
- + .flags = 0,
- + .len = 1,
- + .buf = &start,
- + }, {
- + .addr = DDC_ADDR,
- + .flags = I2C_M_RD,
- + .len = len,
- + .buf = buf,
- + }
- };
- - /*
- - * Avoid sending the segment addr to not upset non-compliant ddc
- - * monitors.
- - */
- + /*
- + * Avoid sending the segment addr to not upset non-compliant ddc
- + * monitors.
- + */
- ret = i2c_transfer(adapter, &msgs[3 - xfers], xfers);
- if (ret == -ENXIO) {
- DRM_DEBUG_KMS("drm: skipping non-existent adapter %s\n",
- - adapter->name);
- + adapter->name);
- break;
- }
- } while (ret != xfers && --retries);
- @@ -1042,7 +1053,7 @@ drm_do_probe_ddc_edid(struct i2c_adapter *adapter, unsigned char *buf,
- return ret == xfers ? 0 : -1;
- }
- -static bool drm_edid_is_zero(u8 *in_edid, int length)
- +static bool drm_edid_is_zero(u8 * in_edid, int length)
- {
- if (memchr_inv(in_edid, 0, length))
- return false;
- @@ -1050,12 +1061,13 @@ static bool drm_edid_is_zero(u8 *in_edid, int length)
- return true;
- }
- -static u8 *
- -drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)
- +static u8 *drm_do_get_edid(struct drm_connector *connector,
- + struct i2c_adapter *adapter)
- {
- int i, j = 0, valid_extensions = 0;
- u8 *block, *new;
- - bool print_bad_edid = !connector->bad_edid_counter || (drm_debug & DRM_UT_KMS);
- + bool print_bad_edid = !connector->bad_edid_counter
- + || (drm_debug & DRM_UT_KMS);
- if ((block = kmalloc(EDID_LENGTH, GFP_KERNEL)) == NULL)
- return NULL;
- @@ -1086,10 +1098,13 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)
- for (j = 1; j <= block[0x7e]; j++) {
- for (i = 0; i < 4; i++) {
- if (drm_do_probe_ddc_edid(adapter,
- - block + (valid_extensions + 1) * EDID_LENGTH,
- - j, EDID_LENGTH))
- + block + (valid_extensions +
- + 1) * EDID_LENGTH, j,
- + EDID_LENGTH))
- goto out;
- - if (drm_edid_block_valid(block + (valid_extensions + 1) * EDID_LENGTH, j, print_bad_edid)) {
- + if (drm_edid_block_valid
- + (block + (valid_extensions + 1) * EDID_LENGTH, j,
- + print_bad_edid)) {
- valid_extensions++;
- break;
- }
- @@ -1097,17 +1112,19 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)
- if (i == 4 && print_bad_edid) {
- dev_warn(connector->dev->dev,
- - "%s: Ignoring invalid EDID block %d.\n",
- - drm_get_connector_name(connector), j);
- + "%s: Ignoring invalid EDID block %d.\n",
- + drm_get_connector_name(connector), j);
- connector->bad_edid_counter++;
- }
- }
- if (valid_extensions != block[0x7e]) {
- - block[EDID_LENGTH-1] += block[0x7e] - valid_extensions;
- + block[EDID_LENGTH - 1] += block[0x7e] - valid_extensions;
- block[0x7e] = valid_extensions;
- - new = krealloc(block, (valid_extensions + 1) * EDID_LENGTH, GFP_KERNEL);
- + new =
- + krealloc(block, (valid_extensions + 1) * EDID_LENGTH,
- + GFP_KERNEL);
- if (!new)
- goto out;
- block = new;
- @@ -1133,13 +1150,13 @@ out:
- * \param adapter : i2c device adaptor
- * \return 1 on success
- */
- -bool
- -drm_probe_ddc(struct i2c_adapter *adapter)
- +bool drm_probe_ddc(struct i2c_adapter * adapter)
- {
- unsigned char out;
- return (drm_do_probe_ddc_edid(adapter, &out, 0, 1) == 0);
- }
- +
- EXPORT_SYMBOL(drm_probe_ddc);
- /**
- @@ -1162,6 +1179,7 @@ struct edid *drm_get_edid(struct drm_connector *connector,
- return edid;
- }
- +
- EXPORT_SYMBOL(drm_get_edid);
- /*** EDID parsing ***/
- @@ -1218,8 +1236,7 @@ static u32 edid_get_quirks(struct edid *edid)
- * Walk the mode list for @connector, clearing the preferred status
- * on existing modes and setting it anew for the right mode ala @quirks.
- */
- -static void edid_fixup_preferred(struct drm_connector *connector,
- - u32 quirks)
- +static void edid_fixup_preferred(struct drm_connector *connector, u32 quirks)
- {
- struct drm_display_mode *t, *cur_mode, *preferred_mode;
- int target_refresh = 0;
- @@ -1256,13 +1273,12 @@ static void edid_fixup_preferred(struct drm_connector *connector,
- preferred_mode->type |= DRM_MODE_TYPE_PREFERRED;
- }
- -static bool
- -mode_is_rb(const struct drm_display_mode *mode)
- +static bool mode_is_rb(const struct drm_display_mode *mode)
- {
- return (mode->htotal - mode->hdisplay == 160) &&
- - (mode->hsync_end - mode->hdisplay == 80) &&
- - (mode->hsync_end - mode->hsync_start == 32) &&
- - (mode->vsync_start - mode->vdisplay == 3);
- + (mode->hsync_end - mode->hdisplay == 80) &&
- + (mode->hsync_end - mode->hsync_start == 32) &&
- + (mode->vsync_start - mode->vdisplay == 3);
- }
- /*
- @@ -1298,12 +1314,13 @@ struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev,
- return NULL;
- }
- +
- EXPORT_SYMBOL(drm_mode_find_dmt);
- typedef void detailed_cb(struct detailed_timing *timing, void *closure);
- static void
- -cea_for_each_detailed_block(u8 *ext, detailed_cb *cb, void *closure)
- +cea_for_each_detailed_block(u8 * ext, detailed_cb * cb, void *closure)
- {
- int i, n = 0;
- u8 d = ext[0x02];
- @@ -1315,20 +1332,20 @@ cea_for_each_detailed_block(u8 *ext, detailed_cb *cb, void *closure)
- }
- static void
- -vtb_for_each_detailed_block(u8 *ext, detailed_cb *cb, void *closure)
- +vtb_for_each_detailed_block(u8 * ext, detailed_cb * cb, void *closure)
- {
- unsigned int i, n = min((int)ext[0x02], 6);
- u8 *det_base = ext + 5;
- if (ext[0x01] != 1)
- - return; /* unknown version */
- + return; /* unknown version */
- for (i = 0; i < n; i++)
- cb((struct detailed_timing *)(det_base + 18 * i), closure);
- }
- static void
- -drm_for_each_detailed_block(u8 *raw_edid, detailed_cb *cb, void *closure)
- +drm_for_each_detailed_block(u8 * raw_edid, detailed_cb * cb, void *closure)
- {
- int i;
- struct edid *edid = (struct edid *)raw_edid;
- @@ -1354,74 +1371,66 @@ drm_for_each_detailed_block(u8 *raw_edid, detailed_cb *cb, void *closure)
- }
- }
- -static void
- -is_rb(struct detailed_timing *t, void *data)
- +static void is_rb(struct detailed_timing *t, void *data)
- {
- - u8 *r = (u8 *)t;
- + u8 *r = (u8 *) t;
- if (r[3] == EDID_DETAIL_MONITOR_RANGE)
- if (r[15] & 0x10)
- - *(bool *)data = true;
- + *(bool *) data = true;
- }
- /* EDID 1.4 defines this explicitly. For EDID 1.3, we guess, badly. */
- -static bool
- -drm_monitor_supports_rb(struct edid *edid)
- +static bool drm_monitor_supports_rb(struct edid *edid)
- {
- if (edid->revision >= 4) {
- bool ret = false;
- - drm_for_each_detailed_block((u8 *)edid, is_rb, &ret);
- + drm_for_each_detailed_block((u8 *) edid, is_rb, &ret);
- return ret;
- }
- return ((edid->input & DRM_EDID_INPUT_DIGITAL) != 0);
- }
- -static void
- -find_gtf2(struct detailed_timing *t, void *data)
- +static void find_gtf2(struct detailed_timing *t, void *data)
- {
- - u8 *r = (u8 *)t;
- + u8 *r = (u8 *) t;
- if (r[3] == EDID_DETAIL_MONITOR_RANGE && r[10] == 0x02)
- - *(u8 **)data = r;
- + *(u8 **) data = r;
- }
- /* Secondary GTF curve kicks in above some break frequency */
- -static int
- -drm_gtf2_hbreak(struct edid *edid)
- +static int drm_gtf2_hbreak(struct edid *edid)
- {
- u8 *r = NULL;
- - drm_for_each_detailed_block((u8 *)edid, find_gtf2, &r);
- + drm_for_each_detailed_block((u8 *) edid, find_gtf2, &r);
- return r ? (r[12] * 2) : 0;
- }
- -static int
- -drm_gtf2_2c(struct edid *edid)
- +static int drm_gtf2_2c(struct edid *edid)
- {
- u8 *r = NULL;
- - drm_for_each_detailed_block((u8 *)edid, find_gtf2, &r);
- + drm_for_each_detailed_block((u8 *) edid, find_gtf2, &r);
- return r ? r[13] : 0;
- }
- -static int
- -drm_gtf2_m(struct edid *edid)
- +static int drm_gtf2_m(struct edid *edid)
- {
- u8 *r = NULL;
- - drm_for_each_detailed_block((u8 *)edid, find_gtf2, &r);
- + drm_for_each_detailed_block((u8 *) edid, find_gtf2, &r);
- return r ? (r[15] << 8) + r[14] : 0;
- }
- -static int
- -drm_gtf2_k(struct edid *edid)
- +static int drm_gtf2_k(struct edid *edid)
- {
- u8 *r = NULL;
- - drm_for_each_detailed_block((u8 *)edid, find_gtf2, &r);
- + drm_for_each_detailed_block((u8 *) edid, find_gtf2, &r);
- return r ? r[16] : 0;
- }
- -static int
- -drm_gtf2_2j(struct edid *edid)
- +static int drm_gtf2_2j(struct edid *edid)
- {
- u8 *r = NULL;
- - drm_for_each_detailed_block((u8 *)edid, find_gtf2, &r);
- + drm_for_each_detailed_block((u8 *) edid, find_gtf2, &r);
- return r ? r[17] : 0;
- }
- @@ -1432,7 +1441,8 @@ drm_gtf2_2j(struct edid *edid)
- static int standard_timing_level(struct edid *edid)
- {
- if (edid->revision >= 2) {
- - if (edid->revision >= 4 && (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF))
- + if (edid->revision >= 4
- + && (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF))
- return LEVEL_CVT;
- if (drm_gtf2_hbreak(edid))
- return LEVEL_GTF2;
- @@ -1445,12 +1455,10 @@ static int standard_timing_level(struct edid *edid)
- * 0 is reserved. The spec says 0x01 fill for unused timings. Some old
- * monitors fill with ascii space (0x20) instead.
- */
- -static int
- -bad_std_timing(u8 a, u8 b)
- +static int bad_std_timing(u8 a, u8 b)
- {
- return (a == 0x00 && b == 0x00) ||
- - (a == 0x01 && b == 0x01) ||
- - (a == 0x20 && b == 0x20);
- + (a == 0x01 && b == 0x01) || (a == 0x20 && b == 0x20);
- }
- /**
- @@ -1461,18 +1469,18 @@ bad_std_timing(u8 a, u8 b)
- * Take the standard timing params (in this case width, aspect, and refresh)
- * and convert them into a real mode using CVT/GTF/DMT.
- */
- -static struct drm_display_mode *
- -drm_mode_std(struct drm_connector *connector, struct edid *edid,
- - struct std_timing *t, int revision)
- +static struct drm_display_mode *drm_mode_std(struct drm_connector *connector,
- + struct edid *edid,
- + struct std_timing *t, int revision)
- {
- struct drm_device *dev = connector->dev;
- struct drm_display_mode *m, *mode = NULL;
- int hsize, vsize;
- int vrefresh_rate;
- unsigned aspect_ratio = (t->vfreq_aspect & EDID_TIMING_ASPECT_MASK)
- - >> EDID_TIMING_ASPECT_SHIFT;
- + >> EDID_TIMING_ASPECT_SHIFT;
- unsigned vfreq = (t->vfreq_aspect & EDID_TIMING_VFREQ_MASK)
- - >> EDID_TIMING_VFREQ_SHIFT;
- + >> EDID_TIMING_VFREQ_SHIFT;
- int timing_level = standard_timing_level(edid);
- if (bad_std_timing(t->hsize, t->vfreq_aspect))
- @@ -1510,14 +1518,13 @@ drm_mode_std(struct drm_connector *connector, struct edid *edid,
- * reduced blanking.
- */
- list_for_each_entry(m, &connector->probed_modes, head)
- - if (m->hdisplay == hsize && m->vdisplay == vsize &&
- - drm_mode_vrefresh(m) == vrefresh_rate)
- - return NULL;
- + if (m->hdisplay == hsize && m->vdisplay == vsize &&
- + drm_mode_vrefresh(m) == vrefresh_rate)
- + return NULL;
- /* HDTV hack, part 2 */
- if (hsize == 1366 && vsize == 768 && vrefresh_rate == 60) {
- - mode = drm_cvt_mode(dev, 1366, 768, vrefresh_rate, 0, 0,
- - false);
- + mode = drm_cvt_mode(dev, 1366, 768, vrefresh_rate, 0, 0, false);
- mode->hdisplay = 1366;
- mode->hsync_start = mode->hsync_start - 1;
- mode->hsync_end = mode->hsync_end - 1;
- @@ -1585,14 +1592,14 @@ drm_mode_do_interlace_quirk(struct drm_display_mode *mode,
- static const struct {
- int w, h;
- } cea_interlaced[] = {
- - { 1920, 1080 },
- - { 720, 480 },
- - { 1440, 480 },
- - { 2880, 480 },
- - { 720, 576 },
- - { 1440, 576 },
- - { 2880, 576 },
- - };
- + {
- + 1920, 1080}, {
- + 720, 480}, {
- + 1440, 480}, {
- + 2880, 480}, {
- + 720, 576}, {
- + 1440, 576}, {
- + 2880, 576},};
- if (!(pt->misc & DRM_EDID_PT_INTERLACED))
- return;
- @@ -1623,8 +1630,8 @@ drm_mode_do_interlace_quirk(struct drm_display_mode *mode,
- */
- static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
- struct edid *edid,
- - struct detailed_timing *timing,
- - u32 quirks)
- + struct detailed_timing
- + *timing, u32 quirks)
- {
- struct drm_display_mode *mode;
- struct detailed_pixel_timing *pt = &timing->data.pixel_data;
- @@ -1632,10 +1639,19 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
- unsigned vactive = (pt->vactive_vblank_hi & 0xf0) << 4 | pt->vactive_lo;
- unsigned hblank = (pt->hactive_hblank_hi & 0xf) << 8 | pt->hblank_lo;
- unsigned vblank = (pt->vactive_vblank_hi & 0xf) << 8 | pt->vblank_lo;
- - unsigned hsync_offset = (pt->hsync_vsync_offset_pulse_width_hi & 0xc0) << 2 | pt->hsync_offset_lo;
- - unsigned hsync_pulse_width = (pt->hsync_vsync_offset_pulse_width_hi & 0x30) << 4 | pt->hsync_pulse_width_lo;
- - unsigned vsync_offset = (pt->hsync_vsync_offset_pulse_width_hi & 0xc) >> 2 | pt->vsync_offset_pulse_width_lo >> 4;
- - unsigned vsync_pulse_width = (pt->hsync_vsync_offset_pulse_width_hi & 0x3) << 4 | (pt->vsync_offset_pulse_width_lo & 0xf);
- + unsigned hsync_offset =
- + (pt->hsync_vsync_offset_pulse_width_hi & 0xc0) << 2 | pt->
- + hsync_offset_lo;
- + unsigned hsync_pulse_width =
- + (pt->hsync_vsync_offset_pulse_width_hi & 0x30) << 4 | pt->
- + hsync_pulse_width_lo;
- + unsigned vsync_offset =
- + (pt->hsync_vsync_offset_pulse_width_hi & 0xc) >> 2 | pt->
- + vsync_offset_pulse_width_lo >> 4;
- + unsigned vsync_pulse_width =
- + (pt->hsync_vsync_offset_pulse_width_hi & 0x3) << 4 | (pt->
- + vsync_offset_pulse_width_lo
- + & 0xf);
- /* ignore tiny modes */
- if (hactive < 64 || vactive < 64)
- @@ -1652,12 +1668,13 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
- /* it is incorrect if hsync/vsync width is zero */
- if (!hsync_pulse_width || !vsync_pulse_width) {
- DRM_DEBUG_KMS("Incorrect Detailed timing. "
- - "Wrong Hsync/Vsync pulse width\n");
- + "Wrong Hsync/Vsync pulse width\n");
- return NULL;
- }
- if (quirks & EDID_QUIRK_FORCE_REDUCED_BLANKING) {
- - mode = drm_cvt_mode(dev, hactive, vactive, 60, true, false, false);
- + mode =
- + drm_cvt_mode(dev, hactive, vactive, 60, true, false, false);
- if (!mode)
- return NULL;
- @@ -1692,17 +1709,19 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
- drm_mode_do_interlace_quirk(mode, pt);
- if (quirks & EDID_QUIRK_DETAILED_SYNC_PP) {
- - pt->misc |= DRM_EDID_PT_HSYNC_POSITIVE | DRM_EDID_PT_VSYNC_POSITIVE;
- + pt->misc |=
- + DRM_EDID_PT_HSYNC_POSITIVE | DRM_EDID_PT_VSYNC_POSITIVE;
- }
- mode->flags |= (pt->misc & DRM_EDID_PT_HSYNC_POSITIVE) ?
- - DRM_MODE_FLAG_PHSYNC : DRM_MODE_FLAG_NHSYNC;
- + DRM_MODE_FLAG_PHSYNC : DRM_MODE_FLAG_NHSYNC;
- mode->flags |= (pt->misc & DRM_EDID_PT_VSYNC_POSITIVE) ?
- - DRM_MODE_FLAG_PVSYNC : DRM_MODE_FLAG_NVSYNC;
- + DRM_MODE_FLAG_PVSYNC : DRM_MODE_FLAG_NVSYNC;
- set_size:
- mode->width_mm = pt->width_mm_lo | (pt->width_height_mm_hi & 0xf0) << 4;
- - mode->height_mm = pt->height_mm_lo | (pt->width_height_mm_hi & 0xf) << 8;
- + mode->height_mm =
- + pt->height_mm_lo | (pt->width_height_mm_hi & 0xf) << 8;
- if (quirks & EDID_QUIRK_DETAILED_IN_CM) {
- mode->width_mm *= 10;
- @@ -1722,16 +1741,16 @@ set_size:
- static bool
- mode_in_hsync_range(const struct drm_display_mode *mode,
- - struct edid *edid, u8 *t)
- + struct edid *edid, u8 * t)
- {
- int hsync, hmin, hmax;
- hmin = t[7];
- if (edid->revision >= 4)
- - hmin += ((t[4] & 0x04) ? 255 : 0);
- + hmin += ((t[4] & 0x04) ? 255 : 0);
- hmax = t[8];
- if (edid->revision >= 4)
- - hmax += ((t[4] & 0x08) ? 255 : 0);
- + hmax += ((t[4] & 0x08) ? 255 : 0);
- hsync = drm_mode_hsync(mode);
- return (hsync <= hmax && hsync >= hmin);
- @@ -1739,23 +1758,22 @@ mode_in_hsync_range(const struct drm_display_mode *mode,
- static bool
- mode_in_vsync_range(const struct drm_display_mode *mode,
- - struct edid *edid, u8 *t)
- + struct edid *edid, u8 * t)
- {
- int vsync, vmin, vmax;
- vmin = t[5];
- if (edid->revision >= 4)
- - vmin += ((t[4] & 0x01) ? 255 : 0);
- + vmin += ((t[4] & 0x01) ? 255 : 0);
- vmax = t[6];
- if (edid->revision >= 4)
- - vmax += ((t[4] & 0x02) ? 255 : 0);
- + vmax += ((t[4] & 0x02) ? 255 : 0);
- vsync = drm_mode_vrefresh(mode);
- return (vsync <= vmax && vsync >= vmin);
- }
- -static u32
- -range_pixel_clock(struct edid *edid, u8 *t)
- +static u32 range_pixel_clock(struct edid *edid, u8 * t)
- {
- /* unspecified */
- if (t[9] == 0 || t[9] == 255)
- @@ -1774,7 +1792,7 @@ mode_in_range(const struct drm_display_mode *mode, struct edid *edid,
- struct detailed_timing *timing)
- {
- u32 max_clock;
- - u8 *t = (u8 *)timing;
- + u8 *t = (u8 *) timing;
- if (!mode_in_hsync_range(mode, edid, t))
- return false;
- @@ -1788,7 +1806,8 @@ mode_in_range(const struct drm_display_mode *mode, struct edid *edid,
- /* 1.4 max horizontal check */
- if (edid->revision >= 4 && t[10] == 0x04)
- - if (t[13] && mode->hdisplay > 8 * (t[13] + (256 * (t[12]&0x3))))
- + if (t[13]
- + && mode->hdisplay > 8 * (t[13] + (256 * (t[12] & 0x3))))
- return false;
- if (mode_is_rb(mode) && !drm_monitor_supports_rb(edid))
- @@ -1807,7 +1826,7 @@ static bool valid_inferred_mode(const struct drm_connector *connector,
- if (mode->hdisplay == m->hdisplay &&
- mode->vdisplay == m->vdisplay &&
- drm_mode_vrefresh(mode) == drm_mode_vrefresh(m))
- - return false; /* duplicated */
- + return false; /* duplicated */
- if (mode->hdisplay <= m->hdisplay &&
- mode->vdisplay <= m->vdisplay)
- ok = true;
- @@ -1907,8 +1926,7 @@ drm_cvt_modes_for_range(struct drm_connector *connector, struct edid *edid,
- return modes;
- }
- -static void
- -do_inferred_modes(struct detailed_timing *timing, void *c)
- +static void do_inferred_modes(struct detailed_timing *timing, void *c)
- {
- struct detailed_mode_closure *closure = c;
- struct detailed_non_pixel *data = &timing->data.other_data;
- @@ -1918,20 +1936,19 @@ do_inferred_modes(struct detailed_timing *timing, void *c)
- return;
- closure->modes += drm_dmt_modes_for_range(closure->connector,
- - closure->edid,
- - timing);
- -
- + closure->edid, timing);
- +
- if (!version_greater(closure->edid, 1, 1))
- - return; /* GTF not defined yet */
- + return; /* GTF not defined yet */
- switch (range->flags) {
- - case 0x02: /* secondary gtf, XXX could do more */
- - case 0x00: /* default gtf */
- + case 0x02: /* secondary gtf, XXX could do more */
- + case 0x00: /* default gtf */
- closure->modes += drm_gtf_modes_for_range(closure->connector,
- closure->edid,
- timing);
- break;
- - case 0x04: /* cvt, only in 1.4+ */
- + case 0x04: /* cvt, only in 1.4+ */
- if (!version_greater(closure->edid, 1, 3))
- break;
- @@ -1939,7 +1956,7 @@ do_inferred_modes(struct detailed_timing *timing, void *c)
- closure->edid,
- timing);
- break;
- - case 0x01: /* just the ranges, no formula */
- + case 0x01: /* just the ranges, no formula */
- default:
- break;
- }
- @@ -1953,7 +1970,7 @@ add_inferred_modes(struct drm_connector *connector, struct edid *edid)
- };
- if (version_greater(edid, 1, 0))
- - drm_for_each_detailed_block((u8 *)edid, do_inferred_modes,
- + drm_for_each_detailed_block((u8 *) edid, do_inferred_modes,
- &closure);
- return closure.modes;
- @@ -1964,7 +1981,7 @@ drm_est3_modes(struct drm_connector *connector, struct detailed_timing *timing)
- {
- int i, j, m, modes = 0;
- struct drm_display_mode *mode;
- - u8 *est = ((u8 *)timing) + 5;
- + u8 *est = ((u8 *) timing) + 5;
- for (i = 0; i < 6; i++) {
- for (j = 7; j > 0; j--) {
- @@ -1988,8 +2005,7 @@ drm_est3_modes(struct drm_connector *connector, struct detailed_timing *timing)
- return modes;
- }
- -static void
- -do_established_modes(struct detailed_timing *timing, void *c)
- +static void do_established_modes(struct detailed_timing *timing, void *c)
- {
- struct detailed_mode_closure *closure = c;
- struct detailed_non_pixel *data = &timing->data.other_data;
- @@ -2010,15 +2026,15 @@ add_established_modes(struct drm_connector *connector, struct edid *edid)
- {
- struct drm_device *dev = connector->dev;
- unsigned long est_bits = edid->established_timings.t1 |
- - (edid->established_timings.t2 << 8) |
- - ((edid->established_timings.mfg_rsvd & 0x80) << 9);
- + (edid->established_timings.t2 << 8) |
- + ((edid->established_timings.mfg_rsvd & 0x80) << 9);
- int i, modes = 0;
- struct detailed_mode_closure closure = {
- connector, edid, 0, 0, 0
- };
- for (i = 0; i <= EDID_EST_TIMINGS; i++) {
- - if (est_bits & (1<<i)) {
- + if (est_bits & (1 << i)) {
- struct drm_display_mode *newmode;
- newmode = drm_mode_duplicate(dev, &edid_est_modes[i]);
- if (newmode) {
- @@ -2029,14 +2045,13 @@ add_established_modes(struct drm_connector *connector, struct edid *edid)
- }
- if (version_greater(edid, 1, 0))
- - drm_for_each_detailed_block((u8 *)edid,
- - do_established_modes, &closure);
- + drm_for_each_detailed_block((u8 *) edid,
- + do_established_modes, &closure);
- return modes + closure.modes;
- }
- -static void
- -do_standard_modes(struct detailed_timing *timing, void *c)
- +static void do_standard_modes(struct detailed_timing *timing, void *c)
- {
- struct detailed_mode_closure *closure = c;
- struct detailed_non_pixel *data = &timing->data.other_data;
- @@ -2088,7 +2103,7 @@ add_standard_modes(struct drm_connector *connector, struct edid *edid)
- }
- if (version_greater(edid, 1, 0))
- - drm_for_each_detailed_block((u8 *)edid, do_standard_modes,
- + drm_for_each_detailed_block((u8 *) edid, do_standard_modes,
- &closure);
- /* XXX should also look for standard codes in VTB blocks */
- @@ -2145,8 +2160,7 @@ static int drm_cvt_modes(struct drm_connector *connector,
- return modes;
- }
- -static void
- -do_cvt_mode(struct detailed_timing *timing, void *c)
- +static void do_cvt_mode(struct detailed_timing *timing, void *c)
- {
- struct detailed_mode_closure *closure = c;
- struct detailed_non_pixel *data = &timing->data.other_data;
- @@ -2155,23 +2169,21 @@ do_cvt_mode(struct detailed_timing *timing, void *c)
- closure->modes += drm_cvt_modes(closure->connector, timing);
- }
- -static int
- -add_cvt_modes(struct drm_connector *connector, struct edid *edid)
- -{
- +static int add_cvt_modes(struct drm_connector *connector, struct edid *edid)
- +{
- struct detailed_mode_closure closure = {
- connector, edid, 0, 0, 0
- };
- if (version_greater(edid, 1, 2))
- - drm_for_each_detailed_block((u8 *)edid, do_cvt_mode, &closure);
- + drm_for_each_detailed_block((u8 *) edid, do_cvt_mode, &closure);
- /* XXX should also look for CVT codes in VTB blocks */
- return closure.modes;
- }
- -static void
- -do_detailed_mode(struct detailed_timing *timing, void *c)
- +static void do_detailed_mode(struct detailed_timing *timing, void *c)
- {
- struct detailed_mode_closure *closure = c;
- struct drm_display_mode *newmode;
- @@ -2214,7 +2226,7 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid,
- closure.preferred =
- (edid->features & DRM_EDID_FEATURE_PREFERRED_TIMING);
- - drm_for_each_detailed_block((u8 *)edid, do_detailed_mode, &closure);
- + drm_for_each_detailed_block((u8 *) edid, do_detailed_mode, &closure);
- return closure.modes;
- }
- @@ -2233,7 +2245,7 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid,
- /**
- * Search EDID for CEA extension block.
- */
- -u8 *drm_find_cea_extension(struct edid *edid)
- +u8 *drm_find_cea_extension(struct edid * edid)
- {
- u8 *edid_ext = NULL;
- int i;
- @@ -2244,7 +2256,7 @@ u8 *drm_find_cea_extension(struct edid *edid)
- /* Find CEA extension */
- for (i = 0; i < edid->extensions; i++) {
- - edid_ext = (u8 *)edid + EDID_LENGTH * (i + 1);
- + edid_ext = (u8 *) edid + EDID_LENGTH * (i + 1);
- if (edid_ext[0] == CEA_EXT)
- break;
- }
- @@ -2254,6 +2266,7 @@ u8 *drm_find_cea_extension(struct edid *edid)
- return edid_ext;
- }
- +
- EXPORT_SYMBOL(drm_find_cea_extension);
- /**
- @@ -2263,7 +2276,7 @@ EXPORT_SYMBOL(drm_find_cea_extension);
- * Returns the CEA Video ID (VIC) of the mode or 0 if it isn't a CEA-861
- * mode.
- */
- -u8 drm_match_cea_mode(const 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;
- @@ -2276,18 +2289,17 @@ u8 drm_match_cea_mode(const struct drm_display_mode *to_match)
- }
- return 0;
- }
- -EXPORT_SYMBOL(drm_match_cea_mode);
- +EXPORT_SYMBOL(drm_match_cea_mode);
- -static int
- -do_cea_modes (struct drm_connector *connector, u8 *db, u8 len)
- +static int do_cea_modes(struct drm_connector *connector, u8 * db, u8 len)
- {
- struct drm_device *dev = connector->dev;
- - u8 * mode, cea_mode;
- + u8 *mode, cea_mode;
- int modes = 0;
- for (mode = db; mode < db + len; mode++) {
- - cea_mode = (*mode & 127) - 1; /* CEA modes are numbered 1..127 */
- + cea_mode = (*mode & 127) - 1; /* CEA modes are numbered 1..127 */
- if (cea_mode < ARRAY_SIZE(edid_cea_modes)) {
- struct drm_display_mode *newmode;
- newmode = drm_mode_duplicate(dev,
- @@ -2302,26 +2314,22 @@ do_cea_modes (struct drm_connector *connector, u8 *db, u8 len)
- return modes;
- }
- -static int
- -cea_db_payload_len(const u8 *db)
- +static int cea_db_payload_len(const u8 * db)
- {
- return db[0] & 0x1f;
- }
- -static int
- -cea_db_tag(const u8 *db)
- +static int cea_db_tag(const u8 * db)
- {
- return db[0] >> 5;
- }
- -static int
- -cea_revision(const u8 *cea)
- +static int cea_revision(const u8 * cea)
- {
- return cea[1];
- }
- -static int
- -cea_db_offsets(const u8 *cea, int *start, int *end)
- +static int cea_db_offsets(const u8 * cea, int *start, int *end)
- {
- /* Data block offset in CEA extension block */
- *start = 4;
- @@ -2336,11 +2344,10 @@ cea_db_offsets(const u8 *cea, int *start, int *end)
- #define for_each_cea_db(cea, i, start, end) \
- for ((i) = (start); (i) < (end) && (i) + cea_db_payload_len(&(cea)[(i)]) < (end); (i) += cea_db_payload_len(&(cea)[(i)]) + 1)
- -static int
- -add_cea_modes(struct drm_connector *connector, struct edid *edid)
- +static int add_cea_modes(struct drm_connector *connector, struct edid *edid)
- {
- - u8 * cea = drm_find_cea_extension(edid);
- - u8 * db, dbl;
- + u8 *cea = drm_find_cea_extension(edid);
- + u8 *db, dbl;
- int modes = 0;
- if (cea && cea_revision(cea) >= 3) {
- @@ -2354,20 +2361,19 @@ add_cea_modes(struct drm_connector *connector, struct edid *edid)
- dbl = cea_db_payload_len(db);
- if (cea_db_tag(db) == VIDEO_BLOCK)
- - modes += do_cea_modes (connector, db+1, dbl);
- + modes += do_cea_modes(connector, db + 1, dbl);
- }
- }
- return modes;
- }
- -static void
- -parse_hdmi_vsdb(struct drm_connector *connector, const u8 *db)
- +static void parse_hdmi_vsdb(struct drm_connector *connector, const u8 * db)
- {
- u8 len = cea_db_payload_len(db);
- if (len >= 6) {
- - connector->eld[5] |= (db[6] >> 7) << 1; /* Supports_AI */
- + connector->eld[5] |= (db[6] >> 7) << 1; /* Supports_AI */
- connector->dvi_dual = db[6] & 1;
- }
- if (len >= 7)
- @@ -2386,28 +2392,26 @@ parse_hdmi_vsdb(struct drm_connector *connector, const u8 *db)
- connector->audio_latency[1] = db[12];
- DRM_DEBUG_KMS("HDMI: DVI dual %d, "
- - "max TMDS clock %d, "
- - "latency present %d %d, "
- - "video latency %d %d, "
- - "audio latency %d %d\n",
- - connector->dvi_dual,
- - connector->max_tmds_clock,
- - (int) connector->latency_present[0],
- - (int) connector->latency_present[1],
- - connector->video_latency[0],
- - connector->video_latency[1],
- - connector->audio_latency[0],
- - connector->audio_latency[1]);
- + "max TMDS clock %d, "
- + "latency present %d %d, "
- + "video latency %d %d, "
- + "audio latency %d %d\n",
- + connector->dvi_dual,
- + connector->max_tmds_clock,
- + (int)connector->latency_present[0],
- + (int)connector->latency_present[1],
- + connector->video_latency[0],
- + connector->video_latency[1],
- + connector->audio_latency[0], connector->audio_latency[1]);
- }
- -static void
- -monitor_name(struct detailed_timing *t, void *data)
- +static void monitor_name(struct detailed_timing *t, void *data)
- {
- if (t->data.other_data.type == EDID_DETAIL_MONITOR_NAME)
- - *(u8 **)data = t->data.other_data.data.str.str;
- + *(u8 **) data = t->data.other_data.data.str.str;
- }
- -static bool cea_db_is_hdmi_vsdb(const u8 *db)
- +static bool cea_db_is_hdmi_vsdb(const u8 * db)
- {
- int hdmi_id;
- @@ -2452,7 +2456,7 @@ void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid)
- }
- name = NULL;
- - drm_for_each_detailed_block((u8 *)edid, monitor_name, &name);
- + drm_for_each_detailed_block((u8 *) edid, monitor_name, &name);
- for (mnl = 0; name && mnl < 13; mnl++) {
- if (name[mnl] == 0x0a)
- break;
- @@ -2461,7 +2465,7 @@ void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid)
- eld[4] = (cea[1] << 5) | mnl;
- DRM_DEBUG_KMS("ELD monitor %s\n", eld + 20);
- - eld[0] = 2 << 3; /* ELD version: 2 */
- + eld[0] = 2 << 3; /* ELD version: 2 */
- eld[16] = edid->mfg_id[0];
- eld[17] = edid->mfg_id[1];
- @@ -2507,6 +2511,7 @@ void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid)
- DRM_DEBUG_KMS("ELD size %d, SAD count %d\n", (int)eld[2], sad_count);
- }
- +
- EXPORT_SYMBOL(drm_edid_to_eld);
- /**
- @@ -2517,7 +2522,7 @@ EXPORT_SYMBOL(drm_edid_to_eld);
- int drm_av_sync_delay(struct drm_connector *connector,
- struct drm_display_mode *mode)
- {
- - int i = !!(mode->flags & DRM_MODE_FLAG_INTERLACE);
- + int i = ! !(mode->flags & DRM_MODE_FLAG_INTERLACE);
- int a, v;
- if (!connector->latency_present[0])
- @@ -2545,6 +2550,7 @@ int drm_av_sync_delay(struct drm_connector *connector,
- return max(v - a, 0);
- }
- +
- EXPORT_SYMBOL(drm_av_sync_delay);
- /**
- @@ -2562,11 +2568,12 @@ struct drm_connector *drm_select_eld(struct drm_encoder *encoder,
- struct drm_device *dev = encoder->dev;
- list_for_each_entry(connector, &dev->mode_config.connector_list, head)
- - if (connector->encoder == encoder && connector->eld[0])
- - return connector;
- + if (connector->encoder == encoder && connector->eld[0])
- + return connector;
- return NULL;
- }
- +
- EXPORT_SYMBOL(drm_select_eld);
- /**
- @@ -2576,7 +2583,7 @@ EXPORT_SYMBOL(drm_select_eld);
- * Parse the CEA extension according to CEA-861-B.
- * Return true if HDMI, false if not or unknown.
- */
- -bool drm_detect_hdmi_monitor(struct edid *edid)
- +bool drm_detect_hdmi_monitor(struct edid * edid)
- {
- u8 *edid_ext;
- int i;
- @@ -2600,6 +2607,7 @@ bool drm_detect_hdmi_monitor(struct edid *edid)
- return false;
- }
- +
- EXPORT_SYMBOL(drm_detect_hdmi_monitor);
- /**
- @@ -2612,7 +2620,7 @@ EXPORT_SYMBOL(drm_detect_hdmi_monitor);
- * audio' is not defined in EDID.
- *
- */
- -bool drm_detect_monitor_audio(struct edid *edid)
- +bool drm_detect_monitor_audio(struct edid * edid)
- {
- u8 *edid_ext;
- int i, j;
- @@ -2636,7 +2644,8 @@ bool drm_detect_monitor_audio(struct edid *edid)
- for_each_cea_db(edid_ext, i, start_offset, end_offset) {
- if (cea_db_tag(&edid_ext[i]) == AUDIO_BLOCK) {
- has_audio = true;
- - for (j = 1; j < cea_db_payload_len(&edid_ext[i]) + 1; j += 3)
- + for (j = 1; j < cea_db_payload_len(&edid_ext[i]) + 1;
- + j += 3)
- DRM_DEBUG_KMS("CEA audio format %d\n",
- (edid_ext[i + j] >> 3) & 0xf);
- goto end;
- @@ -2645,6 +2654,7 @@ bool drm_detect_monitor_audio(struct edid *edid)
- end:
- return has_audio;
- }
- +
- EXPORT_SYMBOL(drm_detect_monitor_audio);
- /**
- @@ -2654,7 +2664,7 @@ EXPORT_SYMBOL(drm_detect_monitor_audio);
- * as supported. The AVI infoframe can then be used to inform the monitor
- * which quantization range (full or limited) is used.
- */
- -bool drm_rgb_quant_range_selectable(struct edid *edid)
- +bool drm_rgb_quant_range_selectable(struct edid * edid)
- {
- u8 *edid_ext;
- int i, start, end;
- @@ -2676,6 +2686,7 @@ bool drm_rgb_quant_range_selectable(struct edid *edid)
- return false;
- }
- +
- EXPORT_SYMBOL(drm_rgb_quant_range_selectable);
- /**
- @@ -2808,6 +2819,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
- return num_modes;
- }
- +
- EXPORT_SYMBOL(drm_add_edid_modes);
- /**
- @@ -2822,7 +2834,7 @@ EXPORT_SYMBOL(drm_add_edid_modes);
- * Return number of modes added or 0 if we couldn't find any.
- */
- int drm_add_modes_noedid(struct drm_connector *connector,
- - int hdisplay, int vdisplay)
- + int hdisplay, int vdisplay)
- {
- int i, count, num_modes = 0;
- struct drm_display_mode *mode;
- @@ -2843,7 +2855,7 @@ int drm_add_modes_noedid(struct drm_connector *connector,
- * the connector.
- */
- if (ptr->hdisplay > hdisplay ||
- - ptr->vdisplay > vdisplay)
- + ptr->vdisplay > vdisplay)
- continue;
- }
- if (drm_mode_vrefresh(ptr) > 61)
- @@ -2856,6 +2868,7 @@ int drm_add_modes_noedid(struct drm_connector *connector,
- }
- return num_modes;
- }
- +
- EXPORT_SYMBOL(drm_add_modes_noedid);
- /**
- @@ -2888,4 +2901,5 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,
- return 0;
- }
- +
- EXPORT_SYMBOL(drm_hdmi_avi_infoframe_from_display_mode);
Advertisement
Add Comment
Please, Sign In to add comment