drm/radeon: consolidate vga and dvi get_modes functions (v2)
authorAlex Deucher <alexander.deucher@amd.com>
Thu, 10 Jul 2014 17:07:19 +0000 (13:07 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 5 Aug 2014 12:53:26 +0000 (08:53 -0400)
They are identical.

v2: rebase

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/radeon_connectors.c

index 92fbe6ec9081011bd9156974c262230fa0b83848..ce50ea629c71c6db41beac25cc6cb681ce13040c 100644 (file)
@@ -1037,18 +1037,6 @@ static const struct drm_connector_funcs radeon_tv_connector_funcs = {
        .set_property = radeon_connector_set_property,
 };
 
-static int radeon_dvi_get_modes(struct drm_connector *connector)
-{
-       struct radeon_connector *radeon_connector = to_radeon_connector(connector);
-       int ret;
-
-       ret = radeon_ddc_get_modes(radeon_connector);
-
-       radeon_get_native_mode(connector);
-
-       return ret;
-}
-
 static bool radeon_check_hpd_status_unchanged(struct drm_connector *connector)
 {
        struct drm_device *dev = connector->dev;
@@ -1339,7 +1327,7 @@ static int radeon_dvi_mode_valid(struct drm_connector *connector,
 }
 
 static const struct drm_connector_helper_funcs radeon_dvi_connector_helper_funcs = {
-       .get_modes = radeon_dvi_get_modes,
+       .get_modes = radeon_vga_get_modes,
        .mode_valid = radeon_dvi_mode_valid,
        .best_encoder = radeon_dvi_encoder,
 };