]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/radeon: eliminate redundant connector_names table
authorIlija Hadzic <ihadzic@research.bell-labs.com>
Fri, 4 May 2012 15:25:12 +0000 (11:25 -0400)
committerDave Airlie <airlied@redhat.com>
Thu, 17 May 2012 10:44:58 +0000 (11:44 +0100)
connector_names table is just a repeat of information that
already exists in drm_connector_enum_list and the same string
can be retrieved using drm_get_connector_name function.

Nuke the redundant table and use the proper function to retrieve
the connector name.

Signed-off-by: Ilija Hadzic <ihadzic@research.bell-labs.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/radeon_display.c

index 0a1d4bd65edcebc31cbb425120e3c5090f7e2382..0c6d63bf6f95d68a8b51d4ffc09566f5116f623f 100644 (file)
@@ -573,24 +573,6 @@ static const char *encoder_names[37] = {
        "INTERNAL_VCE"
 };
 
-static const char *connector_names[15] = {
-       "Unknown",
-       "VGA",
-       "DVI-I",
-       "DVI-D",
-       "DVI-A",
-       "Composite",
-       "S-video",
-       "LVDS",
-       "Component",
-       "DIN",
-       "DisplayPort",
-       "HDMI-A",
-       "HDMI-B",
-       "TV",
-       "eDP",
-};
-
 static const char *hpd_names[6] = {
        "HPD1",
        "HPD2",
@@ -613,7 +595,7 @@ static void radeon_print_display_setup(struct drm_device *dev)
        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
                radeon_connector = to_radeon_connector(connector);
                DRM_INFO("Connector %d:\n", i);
-               DRM_INFO("  %s\n", connector_names[connector->connector_type]);
+               DRM_INFO("  %s\n", drm_get_connector_name(connector));
                if (radeon_connector->hpd.hpd != RADEON_HPD_NONE)
                        DRM_INFO("  %s\n", hpd_names[radeon_connector->hpd.hpd]);
                if (radeon_connector->ddc_bus) {