Commit 72082093 authored by Jani Nikula's avatar Jani Nikula Committed by Dave Airlie

drm/radeon: replace drm_get_connector_name() with direct name field use

Generated using semantic patch:

@@
expression E;
@@

- drm_get_connector_name(E)
+ E->name

[airlied: regenerated]
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 8c6c361a
...@@ -342,19 +342,19 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode ...@@ -342,19 +342,19 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
case 16: case 16:
default: default:
DRM_DEBUG("%s: Disabling hdmi deep color for %d bpc.\n", DRM_DEBUG("%s: Disabling hdmi deep color for %d bpc.\n",
drm_get_connector_name(connector), bpc); connector->name, bpc);
break; break;
case 10: case 10:
val |= HDMI_DEEP_COLOR_ENABLE; val |= HDMI_DEEP_COLOR_ENABLE;
val |= HDMI_DEEP_COLOR_DEPTH(HDMI_30BIT_DEEP_COLOR); val |= HDMI_DEEP_COLOR_DEPTH(HDMI_30BIT_DEEP_COLOR);
DRM_DEBUG("%s: Enabling hdmi deep color 30 for 10 bpc.\n", DRM_DEBUG("%s: Enabling hdmi deep color 30 for 10 bpc.\n",
drm_get_connector_name(connector)); connector->name);
break; break;
case 12: case 12:
val |= HDMI_DEEP_COLOR_ENABLE; val |= HDMI_DEEP_COLOR_ENABLE;
val |= HDMI_DEEP_COLOR_DEPTH(HDMI_36BIT_DEEP_COLOR); val |= HDMI_DEEP_COLOR_DEPTH(HDMI_36BIT_DEEP_COLOR);
DRM_DEBUG("%s: Enabling hdmi deep color 36 for 12 bpc.\n", DRM_DEBUG("%s: Enabling hdmi deep color 36 for 12 bpc.\n",
drm_get_connector_name(connector)); connector->name);
break; break;
} }
......
...@@ -150,7 +150,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector) ...@@ -150,7 +150,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)
/* hdmi deep color only implemented on DCE4+ */ /* hdmi deep color only implemented on DCE4+ */
if ((bpc > 8) && !ASIC_IS_DCE4(rdev)) { if ((bpc > 8) && !ASIC_IS_DCE4(rdev)) {
DRM_DEBUG("%s: HDMI deep color %d bpc unsupported. Using 8 bpc.\n", DRM_DEBUG("%s: HDMI deep color %d bpc unsupported. Using 8 bpc.\n",
drm_get_connector_name(connector), bpc); connector->name, bpc);
bpc = 8; bpc = 8;
} }
...@@ -162,13 +162,13 @@ int radeon_get_monitor_bpc(struct drm_connector *connector) ...@@ -162,13 +162,13 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)
*/ */
if (bpc > 12) { if (bpc > 12) {
DRM_DEBUG("%s: HDMI deep color %d bpc unsupported. Using 12 bpc.\n", DRM_DEBUG("%s: HDMI deep color %d bpc unsupported. Using 12 bpc.\n",
drm_get_connector_name(connector), bpc); connector->name, bpc);
bpc = 12; bpc = 12;
} }
} }
DRM_DEBUG("%s: Display bpc=%d, returned bpc=%d\n", DRM_DEBUG("%s: Display bpc=%d, returned bpc=%d\n",
drm_get_connector_name(connector), connector->display_info.bpc, bpc); connector->name, connector->display_info.bpc, bpc);
return bpc; return bpc;
} }
...@@ -285,13 +285,17 @@ radeon_connector_analog_encoder_conflict_solve(struct drm_connector *connector, ...@@ -285,13 +285,17 @@ radeon_connector_analog_encoder_conflict_solve(struct drm_connector *connector,
continue; continue;
if (priority == true) { if (priority == true) {
DRM_DEBUG_KMS("1: conflicting encoders switching off %s\n", drm_get_connector_name(conflict)); DRM_DEBUG_KMS("1: conflicting encoders switching off %s\n",
DRM_DEBUG_KMS("in favor of %s\n", drm_get_connector_name(connector)); conflict->name);
DRM_DEBUG_KMS("in favor of %s\n",
connector->name);
conflict->status = connector_status_disconnected; conflict->status = connector_status_disconnected;
radeon_connector_update_scratch_regs(conflict, connector_status_disconnected); radeon_connector_update_scratch_regs(conflict, connector_status_disconnected);
} else { } else {
DRM_DEBUG_KMS("2: conflicting encoders switching off %s\n", drm_get_connector_name(connector)); DRM_DEBUG_KMS("2: conflicting encoders switching off %s\n",
DRM_DEBUG_KMS("in favor of %s\n", drm_get_connector_name(conflict)); connector->name);
DRM_DEBUG_KMS("in favor of %s\n",
conflict->name);
current_status = connector_status_disconnected; current_status = connector_status_disconnected;
} }
break; break;
...@@ -812,7 +816,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force) ...@@ -812,7 +816,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
if (!radeon_connector->edid) { if (!radeon_connector->edid) {
DRM_ERROR("%s: probed a monitor but no|invalid EDID\n", DRM_ERROR("%s: probed a monitor but no|invalid EDID\n",
drm_get_connector_name(connector)); connector->name);
ret = connector_status_connected; ret = connector_status_connected;
} else { } else {
radeon_connector->use_digital = !!(radeon_connector->edid->input & DRM_EDID_INPUT_DIGITAL); radeon_connector->use_digital = !!(radeon_connector->edid->input & DRM_EDID_INPUT_DIGITAL);
...@@ -1035,12 +1039,13 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) ...@@ -1035,12 +1039,13 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
if (!radeon_connector->edid) { if (!radeon_connector->edid) {
DRM_ERROR("%s: probed a monitor but no|invalid EDID\n", DRM_ERROR("%s: probed a monitor but no|invalid EDID\n",
drm_get_connector_name(connector)); connector->name);
/* rs690 seems to have a problem with connectors not existing and always /* rs690 seems to have a problem with connectors not existing and always
* return a block of 0's. If we see this just stop polling on this output */ * return a block of 0's. If we see this just stop polling on this output */
if ((rdev->family == CHIP_RS690 || rdev->family == CHIP_RS740) && radeon_connector->base.null_edid_counter) { if ((rdev->family == CHIP_RS690 || rdev->family == CHIP_RS740) && radeon_connector->base.null_edid_counter) {
ret = connector_status_disconnected; ret = connector_status_disconnected;
DRM_ERROR("%s: detected RS690 floating bus bug, stopping ddc detect\n", drm_get_connector_name(connector)); DRM_ERROR("%s: detected RS690 floating bus bug, stopping ddc detect\n",
connector->name);
radeon_connector->ddc_bus = NULL; radeon_connector->ddc_bus = NULL;
} else { } else {
ret = connector_status_connected; ret = connector_status_connected;
......
...@@ -703,7 +703,7 @@ static void radeon_print_display_setup(struct drm_device *dev) ...@@ -703,7 +703,7 @@ static void radeon_print_display_setup(struct drm_device *dev)
list_for_each_entry(connector, &dev->mode_config.connector_list, head) { list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
radeon_connector = to_radeon_connector(connector); radeon_connector = to_radeon_connector(connector);
DRM_INFO("Connector %d:\n", i); DRM_INFO("Connector %d:\n", i);
DRM_INFO(" %s\n", drm_get_connector_name(connector)); DRM_INFO(" %s\n", connector->name);
if (radeon_connector->hpd.hpd != RADEON_HPD_NONE) if (radeon_connector->hpd.hpd != RADEON_HPD_NONE)
DRM_INFO(" %s\n", hpd_names[radeon_connector->hpd.hpd]); DRM_INFO(" %s\n", hpd_names[radeon_connector->hpd.hpd]);
if (radeon_connector->ddc_bus) { if (radeon_connector->ddc_bus) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment