aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2014-07-10 13:07:19 -0400
committerAlex Deucher <alexander.deucher@amd.com>2014-08-05 08:53:26 -0400
commit3e22920fbd0005927bc41f71daeb056a0f4def82 (patch)
tree913f65ac1667abd67b5d916d08e0f7171c70a87c
parentda9976206c15178eeae1b4445c9266125bf35b0a (diff)
drm/radeon: consolidate vga and dvi get_modes functions (v2)
They are identical. v2: rebase Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_connectors.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 92fbe6ec9081..ce50ea629c71 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -1037,18 +1037,6 @@ static const struct drm_connector_funcs radeon_tv_connector_funcs = {
1037 .set_property = radeon_connector_set_property, 1037 .set_property = radeon_connector_set_property,
1038}; 1038};
1039 1039
1040static int radeon_dvi_get_modes(struct drm_connector *connector)
1041{
1042 struct radeon_connector *radeon_connector = to_radeon_connector(connector);
1043 int ret;
1044
1045 ret = radeon_ddc_get_modes(radeon_connector);
1046
1047 radeon_get_native_mode(connector);
1048
1049 return ret;
1050}
1051
1052static bool radeon_check_hpd_status_unchanged(struct drm_connector *connector) 1040static bool radeon_check_hpd_status_unchanged(struct drm_connector *connector)
1053{ 1041{
1054 struct drm_device *dev = connector->dev; 1042 struct drm_device *dev = connector->dev;
@@ -1339,7 +1327,7 @@ static int radeon_dvi_mode_valid(struct drm_connector *connector,
1339} 1327}
1340 1328
1341static const struct drm_connector_helper_funcs radeon_dvi_connector_helper_funcs = { 1329static const struct drm_connector_helper_funcs radeon_dvi_connector_helper_funcs = {
1342 .get_modes = radeon_dvi_get_modes, 1330 .get_modes = radeon_vga_get_modes,
1343 .mode_valid = radeon_dvi_mode_valid, 1331 .mode_valid = radeon_dvi_mode_valid,
1344 .best_encoder = radeon_dvi_encoder, 1332 .best_encoder = radeon_dvi_encoder,
1345}; 1333};