tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

fbdev: Ditch fb_edid_add_monspecs

It's dead code ever since

commit 34280340b1dc74c521e636f45cd728f9abf56ee2
Author: Geert Uytterhoeven <geert+renesas@glider.be>
Date: Fri Dec 4 17:01:43 2015 +0100

fbdev: Remove unused SH-Mobile HDMI driver

Also with this gone we can remove the cea_modes db. This entire thing
is massively incomplete anyway, compared to the CEA parsing that
drm_edid.c does.

Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Tavis Ormandy <taviso@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190721201956.941-1-daniel.vetter@ffwll.ch

authored by

Daniel Vetter and committed by
Bartlomiej Zolnierkiewicz 3b8720e6 513be333

-156
-96
drivers/video/fbdev/core/fbmon.c
··· 999 999 DPRINTK("========================================\n"); 1000 1000 } 1001 1001 1002 - /** 1003 - * fb_edid_add_monspecs() - add monitor video modes from E-EDID data 1004 - * @edid: 128 byte array with an E-EDID block 1005 - * @spacs: monitor specs to be extended 1006 - */ 1007 - void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs) 1008 - { 1009 - unsigned char *block; 1010 - struct fb_videomode *m; 1011 - int num = 0, i; 1012 - u8 svd[64], edt[(128 - 4) / DETAILED_TIMING_DESCRIPTION_SIZE]; 1013 - u8 pos = 4, svd_n = 0; 1014 - 1015 - if (!edid) 1016 - return; 1017 - 1018 - if (!edid_checksum(edid)) 1019 - return; 1020 - 1021 - if (edid[0] != 0x2 || 1022 - edid[2] < 4 || edid[2] > 128 - DETAILED_TIMING_DESCRIPTION_SIZE) 1023 - return; 1024 - 1025 - DPRINTK(" Short Video Descriptors\n"); 1026 - 1027 - while (pos < edid[2]) { 1028 - u8 len = edid[pos] & 0x1f, type = (edid[pos] >> 5) & 7; 1029 - pr_debug("Data block %u of %u bytes\n", type, len); 1030 - if (type == 2) { 1031 - for (i = pos; i < pos + len; i++) { 1032 - u8 idx = edid[pos + i] & 0x7f; 1033 - svd[svd_n++] = idx; 1034 - pr_debug("N%sative mode #%d\n", 1035 - edid[pos + i] & 0x80 ? "" : "on-n", idx); 1036 - } 1037 - } else if (type == 3 && len >= 3) { 1038 - /* Check Vendor Specific Data Block. For HDMI, 1039 - it is always 00-0C-03 for HDMI Licensing, LLC. */ 1040 - if (edid[pos + 1] == 3 && edid[pos + 2] == 0xc && 1041 - edid[pos + 3] == 0) 1042 - specs->misc |= FB_MISC_HDMI; 1043 - } 1044 - pos += len + 1; 1045 - } 1046 - 1047 - block = edid + edid[2]; 1048 - 1049 - DPRINTK(" Extended Detailed Timings\n"); 1050 - 1051 - for (i = 0; i < (128 - edid[2]) / DETAILED_TIMING_DESCRIPTION_SIZE; 1052 - i++, block += DETAILED_TIMING_DESCRIPTION_SIZE) 1053 - if (PIXEL_CLOCK != 0) 1054 - edt[num++] = block - edid; 1055 - 1056 - /* Yikes, EDID data is totally useless */ 1057 - if (!(num + svd_n)) 1058 - return; 1059 - 1060 - m = kcalloc(specs->modedb_len + num + svd_n, 1061 - sizeof(struct fb_videomode), 1062 - GFP_KERNEL); 1063 - 1064 - if (!m) 1065 - return; 1066 - 1067 - memcpy(m, specs->modedb, specs->modedb_len * sizeof(struct fb_videomode)); 1068 - 1069 - for (i = specs->modedb_len; i < specs->modedb_len + num; i++) { 1070 - get_detailed_timing(edid + edt[i - specs->modedb_len], &m[i]); 1071 - if (i == specs->modedb_len) 1072 - m[i].flag |= FB_MODE_IS_FIRST; 1073 - pr_debug("Adding %ux%u@%u\n", m[i].xres, m[i].yres, m[i].refresh); 1074 - } 1075 - 1076 - for (i = specs->modedb_len + num; i < specs->modedb_len + num + svd_n; i++) { 1077 - int idx = svd[i - specs->modedb_len - num]; 1078 - if (!idx || idx >= ARRAY_SIZE(cea_modes)) { 1079 - pr_warn("Reserved SVD code %d\n", idx); 1080 - } else if (!cea_modes[idx].xres) { 1081 - pr_warn("Unimplemented SVD code %d\n", idx); 1082 - } else { 1083 - memcpy(&m[i], cea_modes + idx, sizeof(m[i])); 1084 - pr_debug("Adding SVD #%d: %ux%u@%u\n", idx, 1085 - m[i].xres, m[i].yres, m[i].refresh); 1086 - } 1087 - } 1088 - 1089 - kfree(specs->modedb); 1090 - specs->modedb = m; 1091 - specs->modedb_len = specs->modedb_len + num + svd_n; 1092 - } 1093 - 1094 1002 /* 1095 1003 * VESA Generalized Timing Formula (GTF) 1096 1004 */ ··· 1408 1500 void fb_edid_to_monspecs(unsigned char *edid, struct fb_monspecs *specs) 1409 1501 { 1410 1502 } 1411 - void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs) 1412 - { 1413 - } 1414 1503 void fb_destroy_modedb(struct fb_videomode *modedb) 1415 1504 { 1416 1505 } ··· 1515 1610 1516 1611 EXPORT_SYMBOL(fb_parse_edid); 1517 1612 EXPORT_SYMBOL(fb_edid_to_monspecs); 1518 - EXPORT_SYMBOL(fb_edid_add_monspecs); 1519 1613 EXPORT_SYMBOL(fb_get_mode); 1520 1614 EXPORT_SYMBOL(fb_validate_mode); 1521 1615 EXPORT_SYMBOL(fb_destroy_modedb);
-57
drivers/video/fbdev/core/modedb.c
··· 289 289 }; 290 290 291 291 #ifdef CONFIG_FB_MODE_HELPERS 292 - const struct fb_videomode cea_modes[65] = { 293 - /* #1: 640x480p@59.94/60Hz */ 294 - [1] = { 295 - NULL, 60, 640, 480, 39722, 48, 16, 33, 10, 96, 2, 0, 296 - FB_VMODE_NONINTERLACED, 0, 297 - }, 298 - /* #3: 720x480p@59.94/60Hz */ 299 - [3] = { 300 - NULL, 60, 720, 480, 37037, 60, 16, 30, 9, 62, 6, 0, 301 - FB_VMODE_NONINTERLACED, 0, 302 - }, 303 - /* #5: 1920x1080i@59.94/60Hz */ 304 - [5] = { 305 - NULL, 60, 1920, 1080, 13763, 148, 88, 15, 2, 44, 5, 306 - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, 307 - FB_VMODE_INTERLACED, 0, 308 - }, 309 - /* #7: 720(1440)x480iH@59.94/60Hz */ 310 - [7] = { 311 - NULL, 60, 1440, 480, 18554/*37108*/, 114, 38, 15, 4, 124, 3, 0, 312 - FB_VMODE_INTERLACED, 0, 313 - }, 314 - /* #9: 720(1440)x240pH@59.94/60Hz */ 315 - [9] = { 316 - NULL, 60, 1440, 240, 18554, 114, 38, 16, 4, 124, 3, 0, 317 - FB_VMODE_NONINTERLACED, 0, 318 - }, 319 - /* #18: 720x576pH@50Hz */ 320 - [18] = { 321 - NULL, 50, 720, 576, 37037, 68, 12, 39, 5, 64, 5, 0, 322 - FB_VMODE_NONINTERLACED, 0, 323 - }, 324 - /* #19: 1280x720p@50Hz */ 325 - [19] = { 326 - NULL, 50, 1280, 720, 13468, 220, 440, 20, 5, 40, 5, 327 - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, 328 - FB_VMODE_NONINTERLACED, 0, 329 - }, 330 - /* #20: 1920x1080i@50Hz */ 331 - [20] = { 332 - NULL, 50, 1920, 1080, 13480, 148, 528, 15, 5, 528, 5, 333 - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, 334 - FB_VMODE_INTERLACED, 0, 335 - }, 336 - /* #32: 1920x1080p@23.98/24Hz */ 337 - [32] = { 338 - NULL, 24, 1920, 1080, 13468, 148, 638, 36, 4, 44, 5, 339 - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, 340 - FB_VMODE_NONINTERLACED, 0, 341 - }, 342 - /* #35: (2880)x480p4x@59.94/60Hz */ 343 - [35] = { 344 - NULL, 60, 2880, 480, 9250, 240, 64, 30, 9, 248, 6, 0, 345 - FB_VMODE_NONINTERLACED, 0, 346 - }, 347 - }; 348 - 349 292 const struct fb_videomode vesa_modes[] = { 350 293 /* 0 640x350-85 VESA */ 351 294 { NULL, 85, 640, 350, 31746, 96, 32, 60, 32, 64, 3,
-3
include/linux/fb.h
··· 721 721 extern const unsigned char *fb_firmware_edid(struct device *device); 722 722 extern void fb_edid_to_monspecs(unsigned char *edid, 723 723 struct fb_monspecs *specs); 724 - extern void fb_edid_add_monspecs(unsigned char *edid, 725 - struct fb_monspecs *specs); 726 724 extern void fb_destroy_modedb(struct fb_videomode *modedb); 727 725 extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb); 728 726 extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter); ··· 794 796 795 797 extern const char *fb_mode_option; 796 798 extern const struct fb_videomode vesa_modes[]; 797 - extern const struct fb_videomode cea_modes[65]; 798 799 extern const struct dmt_videomode dmt_modes[]; 799 800 800 801 struct fb_modelist {