Rev 2997 | Rev 3764 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2997 | Rev 3192 | ||
|---|---|---|---|
| Line 446... | Line 446... | ||
| 446 | 446 | ||
| 447 | /* on hw with routers, select right port */ |
447 | /* on hw with routers, select right port */ |
| 448 | if (radeon_connector->router.ddc_valid) |
448 | if (radeon_connector->router.ddc_valid) |
| Line 449... | Line 449... | ||
| 449 | radeon_router_select_ddc_port(radeon_connector); |
449 | radeon_router_select_ddc_port(radeon_connector); |
| - | 450 | ||
| 450 | 451 | if (radeon_connector_encoder_get_dp_bridge_encoder_id(&radeon_connector->base) != |
|
| - | 452 | ENCODER_OBJECT_ID_NONE) { |
|
| - | 453 | struct radeon_connector_atom_dig *dig = radeon_connector->con_priv; |
|
| 451 | if ((radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort) || |
454 | |
| 452 | (radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP) || |
455 | if (dig->dp_i2c_bus) |
| - | 456 | radeon_connector->edid = drm_get_edid(&radeon_connector->base, |
|
| - | 457 | &dig->dp_i2c_bus->adapter); |
|
| 453 | (radeon_connector_encoder_get_dp_bridge_encoder_id(&radeon_connector->base) != |
458 | } else if ((radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort) || |
| Line 454... | Line 459... | ||
| 454 | ENCODER_OBJECT_ID_NONE)) { |
459 | (radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP)) { |
| 455 | struct radeon_connector_atom_dig *dig = radeon_connector->con_priv; |
460 | struct radeon_connector_atom_dig *dig = radeon_connector->con_priv; |
| 456 | 461 | ||
| Line 1036... | Line 1041... | ||
| 1036 | int radeon_modeset_init(struct radeon_device *rdev) |
1041 | int radeon_modeset_init(struct radeon_device *rdev) |
| 1037 | { |
1042 | { |
| 1038 | int i; |
1043 | int i; |
| 1039 | int ret; |
1044 | int ret; |
| Line -... | Line 1045... | ||
| - | 1045 | ||
| - | 1046 | ENTER(); |
|
| 1040 | 1047 | ||
| 1041 | drm_mode_config_init(rdev->ddev); |
1048 | drm_mode_config_init(rdev->ddev); |
| Line 1042... | Line 1049... | ||
| 1042 | rdev->mode_info.mode_config_initialized = true; |
1049 | rdev->mode_info.mode_config_initialized = true; |
| Line 1065... | Line 1072... | ||
| 1065 | } |
1072 | } |
| Line 1066... | Line 1073... | ||
| 1066 | 1073 | ||
| 1067 | /* init i2c buses */ |
1074 | /* init i2c buses */ |
| Line -... | Line 1075... | ||
| - | 1075 | radeon_i2c_init(rdev); |
|
| - | 1076 | ||
| 1068 | radeon_i2c_init(rdev); |
1077 | dbgprintf("i2c init\n"); |
| 1069 | 1078 | ||
| 1070 | /* check combios for a valid hardcoded EDID - Sun servers */ |
1079 | /* check combios for a valid hardcoded EDID - Sun servers */ |
| 1071 | if (!rdev->is_atom_bios) { |
1080 | if (!rdev->is_atom_bios) { |
| 1072 | /* check for hardcoded EDID in BIOS */ |
1081 | /* check for hardcoded EDID in BIOS */ |
| Line 1076... | Line 1085... | ||
| 1076 | /* allocate crtcs */ |
1085 | /* allocate crtcs */ |
| 1077 | for (i = 0; i < rdev->num_crtc; i++) { |
1086 | for (i = 0; i < rdev->num_crtc; i++) { |
| 1078 | radeon_crtc_init(rdev->ddev, i); |
1087 | radeon_crtc_init(rdev->ddev, i); |
| 1079 | } |
1088 | } |
| Line -... | Line 1089... | ||
| - | 1089 | ||
| - | 1090 | dbgprintf("crtc init\n"); |
|
| 1080 | 1091 | ||
| 1081 | /* okay we should have all the bios connectors */ |
1092 | /* okay we should have all the bios connectors */ |
| 1082 | ret = radeon_setup_enc_conn(rdev->ddev); |
1093 | ret = radeon_setup_enc_conn(rdev->ddev); |
| 1083 | if (!ret) { |
1094 | if (!ret) { |
| 1084 | return ret; |
1095 | return ret; |
| Line 1100... | Line 1111... | ||
| 1100 | // radeon_pm_init(rdev); |
1111 | // radeon_pm_init(rdev); |
| Line 1101... | Line 1112... | ||
| 1101 | 1112 | ||
| 1102 | radeon_fbdev_init(rdev); |
1113 | radeon_fbdev_init(rdev); |
| Line -... | Line 1114... | ||
| - | 1114 | // drm_kms_helper_poll_init(rdev->ddev); |
|
| - | 1115 | ||
| 1103 | // drm_kms_helper_poll_init(rdev->ddev); |
1116 | LEAVE(); |
| 1104 | 1117 | ||
| Line 1105... | Line 1118... | ||
| 1105 | return 0; |
1118 | return 0; |
| 1106 | } |
1119 | } |