aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_edid.c
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@avionic-design.de>2012-12-20 09:41:44 -0500
committerThierry Reding <thierry.reding@avionic-design.de>2013-02-22 02:19:53 -0500
commit18316c8c39a85c8b6e3db0a150b1bee5b6c4c053 (patch)
tree10fdeb50456771b21f5d8f9102b015c29e8b8a58 /drivers/gpu/drm/drm_edid.c
parentc976cb37a95a8dcaf23d04d6487fbacc33d3c913 (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 'drivers/gpu/drm/drm_edid.c')
-rw-r--r--drivers/gpu/drm/drm_edid.c30
1 files changed, 7 insertions, 23 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 67aa0dd68250..02da919f6c38 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1516,11 +1516,14 @@ u8 *drm_find_cea_extension(struct edid *edid)
1516} 1516}
1517EXPORT_SYMBOL(drm_find_cea_extension); 1517EXPORT_SYMBOL(drm_find_cea_extension);
1518 1518
1519/* 1519/**
1520 * Looks for a CEA mode matching given drm_display_mode. 1520 * drm_match_cea_mode - look for a CEA mode matching given mode
1521 * Returns its CEA Video ID code, or 0 if not found. 1521 * @to_match: display mode
1522 *
1523 * Returns the CEA Video ID (VIC) of the mode or 0 if it isn't a CEA-861
1524 * mode.
1522 */ 1525 */
1523u8 drm_match_cea_mode(struct drm_display_mode *to_match) 1526u8 drm_match_cea_mode(const struct drm_display_mode *to_match)
1524{ 1527{
1525 struct drm_display_mode *cea_mode; 1528 struct drm_display_mode *cea_mode;
1526 u8 mode; 1529 u8 mode;
@@ -2114,22 +2117,3 @@ int drm_add_modes_noedid(struct drm_connector *connector,
2114 return num_modes; 2117 return num_modes;
2115} 2118}
2116EXPORT_SYMBOL(drm_add_modes_noedid); 2119EXPORT_SYMBOL(drm_add_modes_noedid);
2117
2118/**
2119 * drm_mode_cea_vic - return the CEA-861 VIC of a given mode
2120 * @mode: mode
2121 *
2122 * RETURNS:
2123 * The VIC number, 0 in case it's not a CEA-861 mode.
2124 */
2125uint8_t drm_mode_cea_vic(const struct drm_display_mode *mode)
2126{
2127 uint8_t i;
2128
2129 for (i = 0; i < drm_num_cea_modes; i++)
2130 if (drm_mode_equal(mode, &edid_cea_modes[i]))
2131 return i + 1;
2132
2133 return 0;
2134}
2135EXPORT_SYMBOL(drm_mode_cea_vic);