Rev 1233 | Rev 1268 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1233 | Rev 1246 | ||
|---|---|---|---|
| Line 962... | Line 962... | ||
| 962 | struct drm_connector *connector; |
962 | struct drm_connector *connector; |
| 963 | struct radeon_connector *radeon_connector; |
963 | struct radeon_connector *radeon_connector; |
| 964 | uint32_t subpixel_order = SubPixelNone; |
964 | uint32_t subpixel_order = SubPixelNone; |
| 965 | int ret; |
965 | int ret; |
| Line -... | Line 966... | ||
| - | 966 | ||
| - | 967 | ENTER(); |
|
| - | 968 | ||
| - | 969 | dbgprintf("id %d device %x type %x i2c %x\n", |
|
| 966 | 970 | connector_id, supported_device, connector_type, i2c_bus); |
|
| 967 | /* fixme - tv/cv/din */ |
971 | /* fixme - tv/cv/din */ |
| 968 | if (connector_type == DRM_MODE_CONNECTOR_Unknown) |
972 | if (connector_type == DRM_MODE_CONNECTOR_Unknown) |
| Line 969... | Line 973... | ||
| 969 | return; |
973 | return; |
| 970 | 974 | ||
| 971 | /* see if we already added it */ |
975 | /* see if we already added it */ |
| 972 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
976 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
| 973 | radeon_connector = to_radeon_connector(connector); |
977 | radeon_connector = to_radeon_connector(connector); |
| - | 978 | if (radeon_connector->connector_id == connector_id) { |
|
| 974 | if (radeon_connector->connector_id == connector_id) { |
979 | radeon_connector->devices |= supported_device; |
| 975 | radeon_connector->devices |= supported_device; |
980 | LEAVE(); |
| 976 | return; |
981 | return; |
| Line 977... | Line 982... | ||
| 977 | } |
982 | } |
| Line 1064... | Line 1069... | ||
| 1064 | break; |
1069 | break; |
| 1065 | } |
1070 | } |
| Line 1066... | Line 1071... | ||
| 1066 | 1071 | ||
| 1067 | connector->display_info.subpixel_order = subpixel_order; |
1072 | connector->display_info.subpixel_order = subpixel_order; |
| - | 1073 | drm_sysfs_connector_add(connector); |
|
| 1068 | drm_sysfs_connector_add(connector); |
1074 | LEAVE(); |
| Line 1069... | Line 1075... | ||
| 1069 | return; |
1075 | return; |
| 1070 | 1076 | ||
| 1071 | failed: |
1077 | failed: |
| 1072 | if (radeon_connector->ddc_bus) |
1078 | if (radeon_connector->ddc_bus) |
| 1073 | radeon_i2c_destroy(radeon_connector->ddc_bus); |
1079 | radeon_i2c_destroy(radeon_connector->ddc_bus); |
| - | 1080 | drm_connector_cleanup(connector); |
|
| 1074 | drm_connector_cleanup(connector); |
1081 | kfree(connector); |