| 448,12 → 448,17 |
|---|
| if (radeon_connector->router.ddc_valid) |
| radeon_router_select_ddc_port(radeon_connector); |
| |
| if ((radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort) || |
| (radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP) || |
| (radeon_connector_encoder_get_dp_bridge_encoder_id(&radeon_connector->base) != |
| ENCODER_OBJECT_ID_NONE)) { |
| if (radeon_connector_encoder_get_dp_bridge_encoder_id(&radeon_connector->base) != |
| ENCODER_OBJECT_ID_NONE) { |
| struct radeon_connector_atom_dig *dig = radeon_connector->con_priv; |
| |
| if (dig->dp_i2c_bus) |
| radeon_connector->edid = drm_get_edid(&radeon_connector->base, |
| &dig->dp_i2c_bus->adapter); |
| } else if ((radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort) || |
| (radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP)) { |
| struct radeon_connector_atom_dig *dig = radeon_connector->con_priv; |
| |
| if ((dig->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT || |
| dig->dp_sink_type == CONNECTOR_OBJECT_ID_eDP) && dig->dp_i2c_bus) |
| radeon_connector->edid = drm_get_edid(&radeon_connector->base, |
| 1038,6 → 1043,8 |
|---|
| int i; |
| int ret; |
| |
| ENTER(); |
| |
| drm_mode_config_init(rdev->ddev); |
| rdev->mode_info.mode_config_initialized = true; |
| |
| 1067,6 → 1074,8 |
|---|
| /* init i2c buses */ |
| radeon_i2c_init(rdev); |
| |
| dbgprintf("i2c init\n"); |
| |
| /* check combios for a valid hardcoded EDID - Sun servers */ |
| if (!rdev->is_atom_bios) { |
| /* check for hardcoded EDID in BIOS */ |
| 1078,6 → 1087,8 |
|---|
| radeon_crtc_init(rdev->ddev, i); |
| } |
| |
| dbgprintf("crtc init\n"); |
| |
| /* okay we should have all the bios connectors */ |
| ret = radeon_setup_enc_conn(rdev->ddev); |
| if (!ret) { |
| 1102,6 → 1113,8 |
|---|
| radeon_fbdev_init(rdev); |
| // drm_kms_helper_poll_init(rdev->ddev); |
| |
| LEAVE(); |
| |
| return 0; |
| } |
| |