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 /drivers/gpu | |
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 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/drm_edid.c | 30 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 2 |
4 files changed, 11 insertions, 27 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 | } |
1517 | EXPORT_SYMBOL(drm_find_cea_extension); | 1517 | EXPORT_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 | */ |
1523 | u8 drm_match_cea_mode(struct drm_display_mode *to_match) | 1526 | u8 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 | } |
2116 | EXPORT_SYMBOL(drm_add_modes_noedid); | 2119 | EXPORT_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 | */ | ||
2125 | uint8_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 | } | ||
2135 | EXPORT_SYMBOL(drm_mode_cea_vic); | ||
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 31c0205685ab..f61cb7998c72 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -770,7 +770,7 @@ intel_dp_mode_fixup(struct drm_encoder *encoder, | |||
770 | * CEA-861-E - 5.1 Default Encoding Parameters | 770 | * CEA-861-E - 5.1 Default Encoding Parameters |
771 | * VESA DisplayPort Ver.1.2a - 5.1.1.1 Video Colorimetry | 771 | * VESA DisplayPort Ver.1.2a - 5.1.1.1 Video Colorimetry |
772 | */ | 772 | */ |
773 | if (bpp != 18 && drm_mode_cea_vic(adjusted_mode) > 1) | 773 | if (bpp != 18 && drm_match_cea_mode(adjusted_mode) > 1) |
774 | intel_dp->color_range = DP_COLOR_RANGE_16_235; | 774 | intel_dp->color_range = DP_COLOR_RANGE_16_235; |
775 | else | 775 | else |
776 | intel_dp->color_range = 0; | 776 | intel_dp->color_range = 0; |
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 3ea0c8b6a00f..f131dfc54b01 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c | |||
@@ -348,7 +348,7 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder, | |||
348 | avi_if.body.avi.ITC_EC_Q_SC |= DIP_AVI_RGB_QUANT_RANGE_FULL; | 348 | avi_if.body.avi.ITC_EC_Q_SC |= DIP_AVI_RGB_QUANT_RANGE_FULL; |
349 | } | 349 | } |
350 | 350 | ||
351 | avi_if.body.avi.VIC = drm_mode_cea_vic(adjusted_mode); | 351 | avi_if.body.avi.VIC = drm_match_cea_mode(adjusted_mode); |
352 | 352 | ||
353 | intel_set_infoframe(encoder, &avi_if); | 353 | intel_set_infoframe(encoder, &avi_if); |
354 | } | 354 | } |
@@ -781,7 +781,7 @@ bool intel_hdmi_mode_fixup(struct drm_encoder *encoder, | |||
781 | if (intel_hdmi->color_range_auto) { | 781 | if (intel_hdmi->color_range_auto) { |
782 | /* See CEA-861-E - 5.1 Default Encoding Parameters */ | 782 | /* See CEA-861-E - 5.1 Default Encoding Parameters */ |
783 | if (intel_hdmi->has_hdmi_sink && | 783 | if (intel_hdmi->has_hdmi_sink && |
784 | drm_mode_cea_vic(adjusted_mode) > 1) | 784 | drm_match_cea_mode(adjusted_mode) > 1) |
785 | intel_hdmi->color_range = SDVO_COLOR_RANGE_16_235; | 785 | intel_hdmi->color_range = SDVO_COLOR_RANGE_16_235; |
786 | else | 786 | else |
787 | intel_hdmi->color_range = 0; | 787 | intel_hdmi->color_range = 0; |
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 33b46d9694ea..d07a8cdf998e 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
@@ -1077,7 +1077,7 @@ static bool intel_sdvo_mode_fixup(struct drm_encoder *encoder, | |||
1077 | if (intel_sdvo->color_range_auto) { | 1077 | if (intel_sdvo->color_range_auto) { |
1078 | /* See CEA-861-E - 5.1 Default Encoding Parameters */ | 1078 | /* See CEA-861-E - 5.1 Default Encoding Parameters */ |
1079 | if (intel_sdvo->has_hdmi_monitor && | 1079 | if (intel_sdvo->has_hdmi_monitor && |
1080 | drm_mode_cea_vic(adjusted_mode) > 1) | 1080 | drm_match_cea_mode(adjusted_mode) > 1) |
1081 | intel_sdvo->color_range = SDVO_COLOR_RANGE_16_235; | 1081 | intel_sdvo->color_range = SDVO_COLOR_RANGE_16_235; |
1082 | else | 1082 | else |
1083 | intel_sdvo->color_range = 0; | 1083 | intel_sdvo->color_range = 0; |