diff options
author | Thierry Reding <thierry.reding@avionic-design.de> | 2012-12-20 09:41:44 -0500 |
---|---|---|
committer | Thierry Reding <thierry.reding@avionic-design.de> | 2013-02-22 02:19:53 -0500 |
commit | 18316c8c39a85c8b6e3db0a150b1bee5b6c4c053 (patch) | |
tree | 10fdeb50456771b21f5d8f9102b015c29e8b8a58 /include/drm/drm_crtc.h | |
parent | c976cb37a95a8dcaf23d04d6487fbacc33d3c913 (diff) |
drm: Remove duplicate drm_mode_cea_vic()
The same function had already been merged with a different name. Remove
the duplicate one but reuse some of its kerneldoc fragments for the
existing implementation.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'include/drm/drm_crtc.h')
-rw-r--r-- | include/drm/drm_crtc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 8b7762728639..77627184775c 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h | |||
@@ -1061,7 +1061,7 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev, | |||
1061 | extern int drm_mode_gamma_set_ioctl(struct drm_device *dev, | 1061 | extern int drm_mode_gamma_set_ioctl(struct drm_device *dev, |
1062 | void *data, struct drm_file *file_priv); | 1062 | void *data, struct drm_file *file_priv); |
1063 | extern u8 *drm_find_cea_extension(struct edid *edid); | 1063 | extern u8 *drm_find_cea_extension(struct edid *edid); |
1064 | extern u8 drm_match_cea_mode(struct drm_display_mode *to_match); | 1064 | extern u8 drm_match_cea_mode(const struct drm_display_mode *to_match); |
1065 | extern bool drm_detect_hdmi_monitor(struct edid *edid); | 1065 | extern bool drm_detect_hdmi_monitor(struct edid *edid); |
1066 | extern bool drm_detect_monitor_audio(struct edid *edid); | 1066 | extern bool drm_detect_monitor_audio(struct edid *edid); |
1067 | extern bool drm_rgb_quant_range_selectable(struct edid *edid); | 1067 | extern bool drm_rgb_quant_range_selectable(struct edid *edid); |
@@ -1079,7 +1079,6 @@ extern struct drm_display_mode *drm_gtf_mode_complex(struct drm_device *dev, | |||
1079 | int GTF_2C, int GTF_K, int GTF_2J); | 1079 | int GTF_2C, int GTF_K, int GTF_2J); |
1080 | extern int drm_add_modes_noedid(struct drm_connector *connector, | 1080 | extern int drm_add_modes_noedid(struct drm_connector *connector, |
1081 | int hdisplay, int vdisplay); | 1081 | int hdisplay, int vdisplay); |
1082 | extern uint8_t drm_mode_cea_vic(const struct drm_display_mode *mode); | ||
1083 | 1082 | ||
1084 | extern int drm_edid_header_is_valid(const u8 *raw_edid); | 1083 | extern int drm_edid_header_is_valid(const u8 *raw_edid); |
1085 | extern bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid); | 1084 | extern bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid); |