| 44,6 → 44,8 |
|---|
| radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder, |
| struct drm_connector *drm_connector); |
| |
| bool radeon_connector_encoder_is_dp_bridge(struct drm_connector *connector); |
| |
| void radeon_connector_hotplug(struct drm_connector *connector) |
| { |
| struct drm_device *dev = connector->dev; |
| 836,6 → 838,13 |
|---|
| if (!radeon_connector->edid) { |
| DRM_ERROR("%s: probed a monitor but no|invalid EDID\n", |
| drm_get_connector_name(connector)); |
| /* 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)); |
| radeon_connector->ddc_bus = NULL; |
| } |
| } else { |
| radeon_connector->use_digital = !!(radeon_connector->edid->input & DRM_EDID_INPUT_DIGITAL); |
| |
| 1063,10 → 1072,11 |
|---|
| { |
| struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
| struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv; |
| struct drm_encoder *encoder = radeon_best_single_encoder(connector); |
| int ret; |
| |
| if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { |
| struct drm_encoder *encoder; |
| if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) || |
| (connector->connector_type == DRM_MODE_CONNECTOR_LVDS)) { |
| struct drm_display_mode *mode; |
| |
| if (!radeon_dig_connector->edp_on) |
| 1078,7 → 1088,6 |
|---|
| ATOM_TRANSMITTER_ACTION_POWER_OFF); |
| |
| if (ret > 0) { |
| encoder = radeon_best_single_encoder(connector); |
| if (encoder) { |
| radeon_fixup_lvds_native_mode(encoder, connector); |
| /* add scaled modes */ |
| 1102,8 → 1111,14 |
|---|
| /* add scaled modes */ |
| radeon_add_common_modes(encoder, connector); |
| } |
| } else |
| } else { |
| /* need to setup ddc on the bridge */ |
| if (radeon_connector_encoder_is_dp_bridge(connector)) { |
| if (encoder) |
| radeon_atom_ext_encoder_setup_ddc(encoder); |
| } |
| ret = radeon_ddc_get_modes(radeon_connector); |
| } |
| |
| return ret; |
| } |
| 1187,6 → 1202,7 |
|---|
| struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
| enum drm_connector_status ret = connector_status_disconnected; |
| struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv; |
| struct drm_encoder *encoder = radeon_best_single_encoder(connector); |
| |
| if (radeon_connector->edid) { |
| kfree(radeon_connector->edid); |
| 1193,8 → 1209,8 |
|---|
| radeon_connector->edid = NULL; |
| } |
| |
| if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { |
| struct drm_encoder *encoder = radeon_best_single_encoder(connector); |
| if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) || |
| (connector->connector_type == DRM_MODE_CONNECTOR_LVDS)) { |
| if (encoder) { |
| struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
| struct drm_display_mode *native_mode = &radeon_encoder->native_mode; |
| 1214,6 → 1230,11 |
|---|
| atombios_set_edp_panel_power(connector, |
| ATOM_TRANSMITTER_ACTION_POWER_OFF); |
| } else { |
| /* need to setup ddc on the bridge */ |
| if (radeon_connector_encoder_is_dp_bridge(connector)) { |
| if (encoder) |
| radeon_atom_ext_encoder_setup_ddc(encoder); |
| } |
| radeon_dig_connector->dp_sink_type = radeon_dp_getsinktype(radeon_connector); |
| if (radeon_hpd_sense(rdev, radeon_connector->hpd.hpd)) { |
| ret = connector_status_connected; |
| 1228,7 → 1249,17 |
|---|
| ret = connector_status_connected; |
| } |
| } |
| |
| if ((ret == connector_status_disconnected) && |
| radeon_connector->dac_load_detect) { |
| struct drm_encoder *encoder = radeon_best_single_encoder(connector); |
| struct drm_encoder_helper_funcs *encoder_funcs; |
| if (encoder) { |
| encoder_funcs = encoder->helper_private; |
| ret = encoder_funcs->detect(encoder, connector); |
| } |
| } |
| } |
| |
| radeon_connector_update_scratch_regs(connector, ret); |
| return ret; |
| 1242,7 → 1273,8 |
|---|
| |
| /* XXX check mode bandwidth */ |
| |
| if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { |
| if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) || |
| (connector->connector_type == DRM_MODE_CONNECTOR_LVDS)) { |
| struct drm_encoder *encoder = radeon_best_single_encoder(connector); |
| |
| if ((mode->hdisplay < 320) || (mode->vdisplay < 240)) |
| 1401,6 → 1433,10 |
|---|
| default: |
| connector->interlace_allowed = true; |
| connector->doublescan_allowed = true; |
| radeon_connector->dac_load_detect = true; |
| drm_connector_attach_property(&radeon_connector->base, |
| rdev->mode_info.load_detect_property, |
| 1); |
| break; |
| case DRM_MODE_CONNECTOR_DVII: |
| case DRM_MODE_CONNECTOR_DVID: |
| 1422,6 → 1458,12 |
|---|
| connector->doublescan_allowed = true; |
| else |
| connector->doublescan_allowed = false; |
| if (connector_type == DRM_MODE_CONNECTOR_DVII) { |
| radeon_connector->dac_load_detect = true; |
| drm_connector_attach_property(&radeon_connector->base, |
| rdev->mode_info.load_detect_property, |
| 1); |
| } |
| break; |
| case DRM_MODE_CONNECTOR_LVDS: |
| case DRM_MODE_CONNECTOR_eDP: |