Rev 5271 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 5271 | Rev 6104 | ||
|---|---|---|---|
| Line 177... | Line 177... | ||
| 177 | /* Amilo Xi 2550 only works with acpi bl */ |
177 | /* Amilo Xi 2550 only works with acpi bl */ |
| 178 | if ((rdev->pdev->device == 0x9583) && |
178 | if ((rdev->pdev->device == 0x9583) && |
| 179 | (rdev->pdev->subsystem_vendor == 0x1734) && |
179 | (rdev->pdev->subsystem_vendor == 0x1734) && |
| 180 | (rdev->pdev->subsystem_device == 0x1107)) |
180 | (rdev->pdev->subsystem_device == 0x1107)) |
| 181 | use_bl = false; |
181 | use_bl = false; |
| - | 182 | /* Older PPC macs use on-GPU backlight controller */ |
|
| - | 183 | #ifndef CONFIG_PPC_PMAC |
|
| 182 | /* disable native backlight control on older asics */ |
184 | /* disable native backlight control on older asics */ |
| 183 | else if (rdev->family < CHIP_R600) |
185 | else if (rdev->family < CHIP_R600) |
| 184 | use_bl = false; |
186 | use_bl = false; |
| - | 187 | #endif |
|
| 185 | else |
188 | else |
| 186 | use_bl = true; |
189 | use_bl = true; |
| 187 | } |
190 | } |
| Line 188... | Line 191... | ||
| 188 | 191 | ||
| 189 | if (use_bl) { |
192 | if (use_bl) { |
| 190 | if (rdev->is_atom_bios) |
193 | if (rdev->is_atom_bios) |
| 191 | radeon_atom_backlight_init(radeon_encoder, connector); |
194 | radeon_atom_backlight_init(radeon_encoder, connector); |
| 192 | else |
195 | else |
| 193 | radeon_legacy_backlight_init(radeon_encoder, connector); |
- | |
| 194 | rdev->mode_info.bl_encoder = radeon_encoder; |
196 | radeon_legacy_backlight_init(radeon_encoder, connector); |
| 195 | } |
197 | } |
| Line 196... | Line 198... | ||
| 196 | } |
198 | } |
| 197 | 199 | ||
| Line 242... | Line 244... | ||
| 242 | struct drm_connector *connector; |
244 | struct drm_connector *connector; |
| 243 | struct radeon_connector *radeon_connector; |
245 | struct radeon_connector *radeon_connector; |
| Line 244... | Line 246... | ||
| 244 | 246 | ||
| 245 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
247 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
| - | 248 | radeon_connector = to_radeon_connector(connector); |
|
| - | 249 | if (radeon_encoder->is_mst_encoder) { |
|
| - | 250 | struct radeon_encoder_mst *mst_enc; |
|
| - | 251 | ||
| - | 252 | if (!radeon_connector->is_mst_connector) |
|
| - | 253 | continue; |
|
| - | 254 | ||
| - | 255 | mst_enc = radeon_encoder->enc_priv; |
|
| - | 256 | if (mst_enc->connector == radeon_connector->mst_port) |
|
| 246 | radeon_connector = to_radeon_connector(connector); |
257 | return connector; |
| 247 | if (radeon_encoder->active_device & radeon_connector->devices) |
258 | } else if (radeon_encoder->active_device & radeon_connector->devices) |
| 248 | return connector; |
259 | return connector; |
| 249 | } |
260 | } |
| 250 | return NULL; |
261 | return NULL; |
| Line 388... | Line 399... | ||
| 388 | } else |
399 | } else |
| 389 | return false; |
400 | return false; |
| 390 | case DRM_MODE_CONNECTOR_DVID: |
401 | case DRM_MODE_CONNECTOR_DVID: |
| 391 | case DRM_MODE_CONNECTOR_HDMIA: |
402 | case DRM_MODE_CONNECTOR_HDMIA: |
| 392 | case DRM_MODE_CONNECTOR_DisplayPort: |
403 | case DRM_MODE_CONNECTOR_DisplayPort: |
| - | 404 | if (radeon_connector->is_mst_connector) |
|
| - | 405 | return false; |
|
| - | 406 | ||
| 393 | dig_connector = radeon_connector->con_priv; |
407 | dig_connector = radeon_connector->con_priv; |
| 394 | if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) || |
408 | if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) || |
| 395 | (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP)) |
409 | (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP)) |
| 396 | return false; |
410 | return false; |
| 397 | else { |
411 | else { |