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

diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c
index 3558a70a66640afea5d1259bb7b582b0ba0c5891..8e2e19f3bf44196d09cd8b6c33d60e2ad12ef013 100644 (file)
--- a/drivers/video/fbdev/core/fbmon.c
+++ b/drivers/video/fbdev/core/fbmon.c
@@ -999,98 +999,6 @@ void fb_edid_to_monspecs(unsigned char *edid, struct fb_monspecs *specs)
        DPRINTK("========================================\n");
 }
 
-/**
- * fb_edid_add_monspecs() - add monitor video modes from E-EDID data
- * @edid:      128 byte array with an E-EDID block
- * @spacs:     monitor specs to be extended
- */
-void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs)
-{
-       unsigned char *block;
-       struct fb_videomode *m;
-       int num = 0, i;
-       u8 svd[64], edt[(128 - 4) / DETAILED_TIMING_DESCRIPTION_SIZE];
-       u8 pos = 4, svd_n = 0;
-
-       if (!edid)
-               return;
-
-       if (!edid_checksum(edid))
-               return;
-
-       if (edid[0] != 0x2 ||
-           edid[2] < 4 || edid[2] > 128 - DETAILED_TIMING_DESCRIPTION_SIZE)
-               return;
-
-       DPRINTK("  Short Video Descriptors\n");
-
-       while (pos < edid[2]) {
-               u8 len = edid[pos] & 0x1f, type = (edid[pos] >> 5) & 7;
-               pr_debug("Data block %u of %u bytes\n", type, len);
-               if (type == 2) {
-                       for (i = pos; i < pos + len; i++) {
-                               u8 idx = edid[pos + i] & 0x7f;
-                               svd[svd_n++] = idx;
-                               pr_debug("N%sative mode #%d\n",
-                                        edid[pos + i] & 0x80 ? "" : "on-n", idx);
-                       }
-               } else if (type == 3 && len >= 3) {
-                       /* Check Vendor Specific Data Block.  For HDMI,
-                          it is always 00-0C-03 for HDMI Licensing, LLC. */
-                       if (edid[pos + 1] == 3 && edid[pos + 2] == 0xc &&
-                           edid[pos + 3] == 0)
-                               specs->misc |= FB_MISC_HDMI;
-               }
-               pos += len + 1;
-       }
-
-       block = edid + edid[2];
-
-       DPRINTK("  Extended Detailed Timings\n");
-
-       for (i = 0; i < (128 - edid[2]) / DETAILED_TIMING_DESCRIPTION_SIZE;
-            i++, block += DETAILED_TIMING_DESCRIPTION_SIZE)
-               if (PIXEL_CLOCK != 0)
-                       edt[num++] = block - edid;
-
-       /* Yikes, EDID data is totally useless */
-       if (!(num + svd_n))
-               return;
-
-       m = kcalloc(specs->modedb_len + num + svd_n,
-                   sizeof(struct fb_videomode),
-                   GFP_KERNEL);
-
-       if (!m)
-               return;
-
-       memcpy(m, specs->modedb, specs->modedb_len * sizeof(struct fb_videomode));
-
-       for (i = specs->modedb_len; i < specs->modedb_len + num; i++) {
-               get_detailed_timing(edid + edt[i - specs->modedb_len], &m[i]);
-               if (i == specs->modedb_len)
-                       m[i].flag |= FB_MODE_IS_FIRST;
-               pr_debug("Adding %ux%u@%u\n", m[i].xres, m[i].yres, m[i].refresh);
-       }
-
-       for (i = specs->modedb_len + num; i < specs->modedb_len + num + svd_n; i++) {
-               int idx = svd[i - specs->modedb_len - num];
-               if (!idx || idx >= ARRAY_SIZE(cea_modes)) {
-                       pr_warn("Reserved SVD code %d\n", idx);
-               } else if (!cea_modes[idx].xres) {
-                       pr_warn("Unimplemented SVD code %d\n", idx);
-               } else {
-                       memcpy(&m[i], cea_modes + idx, sizeof(m[i]));
-                       pr_debug("Adding SVD #%d: %ux%u@%u\n", idx,
-                                m[i].xres, m[i].yres, m[i].refresh);
-               }
-       }
-
-       kfree(specs->modedb);
-       specs->modedb = m;
-       specs->modedb_len = specs->modedb_len + num + svd_n;
-}
-
 /*
  * VESA Generalized Timing Formula (GTF)
  */
@@ -1500,9 +1408,6 @@ int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var)
 void fb_edid_to_monspecs(unsigned char *edid, struct fb_monspecs *specs)
 {
 }
-void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs)
-{
-}
 void fb_destroy_modedb(struct fb_videomode *modedb)
 {
 }
@@ -1610,7 +1515,6 @@ EXPORT_SYMBOL(fb_firmware_edid);
 
 EXPORT_SYMBOL(fb_parse_edid);
 EXPORT_SYMBOL(fb_edid_to_monspecs);
-EXPORT_SYMBOL(fb_edid_add_monspecs);
 EXPORT_SYMBOL(fb_get_mode);
 EXPORT_SYMBOL(fb_validate_mode);
 EXPORT_SYMBOL(fb_destroy_modedb);

diff --git a/drivers/video/fbdev/core/modedb.c b/drivers/video/fbdev/core/modedb.c
index ac049871704ddd6148c6c0623b3e603807a885c1..6473e0dfe1464b616ff1999cae7516340456c0d8 100644 (file)
--- a/drivers/video/fbdev/core/modedb.c
+++ b/drivers/video/fbdev/core/modedb.c
@@ -289,63 +289,6 @@ static const struct fb_videomode modedb[] = {
 };
 
 #ifdef CONFIG_FB_MODE_HELPERS
-const struct fb_videomode cea_modes[65] = {
-       /* #1: 640x480p@59.94/60Hz */
-       [1] = {
-               NULL, 60, 640, 480, 39722, 48, 16, 33, 10, 96, 2, 0,
-               FB_VMODE_NONINTERLACED, 0,
-       },
-       /* #3: 720x480p@59.94/60Hz */
-       [3] = {
-               NULL, 60, 720, 480, 37037, 60, 16, 30, 9, 62, 6, 0,
-               FB_VMODE_NONINTERLACED, 0,
-       },
-       /* #5: 1920x1080i@59.94/60Hz */
-       [5] = {
-               NULL, 60, 1920, 1080, 13763, 148, 88, 15, 2, 44, 5,
-               FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-               FB_VMODE_INTERLACED, 0,
-       },
-       /* #7: 720(1440)x480iH@59.94/60Hz */
-       [7] = {
-               NULL, 60, 1440, 480, 18554/*37108*/, 114, 38, 15, 4, 124, 3, 0,
-               FB_VMODE_INTERLACED, 0,
-       },
-       /* #9: 720(1440)x240pH@59.94/60Hz */
-       [9] = {
-               NULL, 60, 1440, 240, 18554, 114, 38, 16, 4, 124, 3, 0,
-               FB_VMODE_NONINTERLACED, 0,
-       },
-       /* #18: 720x576pH@50Hz */
-       [18] = {
-               NULL, 50, 720, 576, 37037, 68, 12, 39, 5, 64, 5, 0,
-               FB_VMODE_NONINTERLACED, 0,
-       },
-       /* #19: 1280x720p@50Hz */
-       [19] = {
-               NULL, 50, 1280, 720, 13468, 220, 440, 20, 5, 40, 5,
-               FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-               FB_VMODE_NONINTERLACED, 0,
-       },
-       /* #20: 1920x1080i@50Hz */
-       [20] = {
-               NULL, 50, 1920, 1080, 13480, 148, 528, 15, 5, 528, 5,
-               FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-               FB_VMODE_INTERLACED, 0,
-       },
-       /* #32: 1920x1080p@23.98/24Hz */
-       [32] = {
-               NULL, 24, 1920, 1080, 13468, 148, 638, 36, 4, 44, 5,
-               FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-               FB_VMODE_NONINTERLACED, 0,
-       },
-       /* #35: (2880)x480p4x@59.94/60Hz */
-       [35] = {
-               NULL, 60, 2880, 480, 9250, 240, 64, 30, 9, 248, 6, 0,
-               FB_VMODE_NONINTERLACED, 0,
-       },
-};
-
 const struct fb_videomode vesa_modes[] = {
        /* 0 640x350-85 VESA */
        { NULL, 85, 640, 350, 31746,  96, 32, 60, 32, 64, 3,

diff --git a/include/linux/fb.h b/include/linux/fb.h
index 3037712646447a182d8fe474bfda3ec3ff864f0d..50948e51989748c6d486711910c60ad4fbf3d9f1 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -721,8 +721,6 @@ extern int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var);
 extern const unsigned char *fb_firmware_edid(struct device *device);
 extern void fb_edid_to_monspecs(unsigned char *edid,
                                struct fb_monspecs *specs);
-extern void fb_edid_add_monspecs(unsigned char *edid,
-                                struct fb_monspecs *specs);
 extern void fb_destroy_modedb(struct fb_videomode *modedb);
 extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb);
 extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter);
@@ -796,7 +794,6 @@ struct dmt_videomode {
 
 extern const char *fb_mode_option;
 extern const struct fb_videomode vesa_modes[];
-extern const struct fb_videomode cea_modes[65];
 extern const struct dmt_videomode dmt_modes[];
 
 struct fb_modelist {