|
@@ -150,7 +150,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)
|
|
|
/* hdmi deep color only implemented on DCE4+ */
|
|
|
if ((bpc > 8) && !ASIC_IS_DCE4(rdev)) {
|
|
|
DRM_DEBUG("%s: HDMI deep color %d bpc unsupported. Using 8 bpc.\n",
|
|
|
- drm_get_connector_name(connector), bpc);
|
|
|
+ connector->name, bpc);
|
|
|
bpc = 8;
|
|
|
}
|
|
|
|
|
@@ -162,13 +162,13 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)
|
|
|
*/
|
|
|
if (bpc > 12) {
|
|
|
DRM_DEBUG("%s: HDMI deep color %d bpc unsupported. Using 12 bpc.\n",
|
|
|
- drm_get_connector_name(connector), bpc);
|
|
|
+ connector->name, bpc);
|
|
|
bpc = 12;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
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;
|
|
|
}
|
|
@@ -285,13 +285,17 @@ radeon_connector_analog_encoder_conflict_solve(struct drm_connector *connector,
|
|
|
continue;
|
|
|
|
|
|
if (priority == true) {
|
|
|
- DRM_DEBUG_KMS("1: conflicting encoders switching off %s\n", drm_get_connector_name(conflict));
|
|
|
- DRM_DEBUG_KMS("in favor of %s\n", drm_get_connector_name(connector));
|
|
|
+ DRM_DEBUG_KMS("1: conflicting encoders switching off %s\n",
|
|
|
+ conflict->name);
|
|
|
+ DRM_DEBUG_KMS("in favor of %s\n",
|
|
|
+ connector->name);
|
|
|
conflict->status = connector_status_disconnected;
|
|
|
radeon_connector_update_scratch_regs(conflict, connector_status_disconnected);
|
|
|
} else {
|
|
|
- DRM_DEBUG_KMS("2: conflicting encoders switching off %s\n", drm_get_connector_name(connector));
|
|
|
- DRM_DEBUG_KMS("in favor of %s\n", drm_get_connector_name(conflict));
|
|
|
+ DRM_DEBUG_KMS("2: conflicting encoders switching off %s\n",
|
|
|
+ connector->name);
|
|
|
+ DRM_DEBUG_KMS("in favor of %s\n",
|
|
|
+ conflict->name);
|
|
|
current_status = connector_status_disconnected;
|
|
|
}
|
|
|
break;
|
|
@@ -812,7 +816,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
|
|
|
|
|
|
if (!radeon_connector->edid) {
|
|
|
DRM_ERROR("%s: probed a monitor but no|invalid EDID\n",
|
|
|
- drm_get_connector_name(connector));
|
|
|
+ connector->name);
|
|
|
ret = connector_status_connected;
|
|
|
} else {
|
|
|
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)
|
|
|
|
|
|
if (!radeon_connector->edid) {
|
|
|
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
|
|
|
* 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) {
|
|
|
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;
|
|
|
} else {
|
|
|
ret = connector_status_connected;
|