From d90bbdc951f75ea8c619bdaaa1369df3a2f1e88a Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Tue, 4 Aug 2020 15:30:34 +0800 Subject: [PATCH] drm/edid: revert some of change by the following commit Fixes: 7ab28c3914d0 ("drm/edid: output common tv resolution and hdmi mode if no read the correct edid") Change-Id: I00dac90a2b64e4b9743813cc9fde9d08ddd38347 Signed-off-by: Sandy Huang --- drivers/gpu/drm/drm_edid.c | 3 +-- include/drm/drm_edid.h | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 87fd6e2b3369..437be3154562 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -3292,7 +3292,7 @@ static u8 svd_to_vic(u8 svd) return svd; } -struct drm_display_mode * +static struct drm_display_mode * drm_display_mode_from_vic_index(struct drm_connector *connector, const u8 *video_db, u8 video_len, u8 video_index) @@ -3317,7 +3317,6 @@ drm_display_mode_from_vic_index(struct drm_connector *connector, return newmode; } -EXPORT_SYMBOL(drm_display_mode_from_vic_index); /* * do_y420vdb_modes - Parse YCBCR 420 only modes diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 814407e1e432..e47335a3a6b5 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -495,8 +495,4 @@ void drm_edid_get_monitor_name(struct edid *edid, char *name, struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev, int hsize, int vsize, int fresh, bool rb); -struct drm_display_mode * -drm_display_mode_from_vic_index(struct drm_connector *connector, - const u8 *video_db, u8 video_len, - u8 video_index); #endif /* __DRM_EDID_H__ */