Rev 5078 | Rev 5271 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 5078 | Rev 5128 | ||
|---|---|---|---|
| Line 445... | Line 445... | ||
| 445 | } else if (*connector_type == DRM_MODE_CONNECTOR_DVID) { |
445 | } else if (*connector_type == DRM_MODE_CONNECTOR_DVID) { |
| 446 | *connector_type = DRM_MODE_CONNECTOR_DVII; |
446 | *connector_type = DRM_MODE_CONNECTOR_DVII; |
| 447 | } |
447 | } |
| 448 | } |
448 | } |
| Line -... | Line 449... | ||
| - | 449 | ||
| - | 450 | /* Fujitsu D3003-S2 board lists DVI-I as DVI-I and VGA */ |
|
| - | 451 | if ((dev->pdev->device == 0x9805) && |
|
| - | 452 | (dev->pdev->subsystem_vendor == 0x1734) && |
|
| - | 453 | (dev->pdev->subsystem_device == 0x11bd)) { |
|
| - | 454 | if (*connector_type == DRM_MODE_CONNECTOR_VGA) |
|
| - | 455 | return false; |
|
| Line 449... | Line 456... | ||
| 449 | 456 | } |
|
| 450 | 457 | ||
| Line 451... | Line 458... | ||
| 451 | return true; |
458 | return true; |
| Line 2279... | Line 2286... | ||
| 2279 | } else if (controller->ucType == ATOM_PP_THERMALCONTROLLER_KAVERI) { |
2286 | } else if (controller->ucType == ATOM_PP_THERMALCONTROLLER_KAVERI) { |
| 2280 | DRM_INFO("Internal thermal controller %s fan control\n", |
2287 | DRM_INFO("Internal thermal controller %s fan control\n", |
| 2281 | (controller->ucFanParameters & |
2288 | (controller->ucFanParameters & |
| 2282 | ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with"); |
2289 | ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with"); |
| 2283 | rdev->pm.int_thermal_type = THERMAL_TYPE_KV; |
2290 | rdev->pm.int_thermal_type = THERMAL_TYPE_KV; |
| 2284 | } else if ((controller->ucType == |
2291 | } else if (controller->ucType == |
| 2285 | ATOM_PP_THERMALCONTROLLER_EXTERNAL_GPIO) || |
2292 | ATOM_PP_THERMALCONTROLLER_EXTERNAL_GPIO) { |
| - | 2293 | DRM_INFO("External GPIO thermal controller %s fan control\n", |
|
| - | 2294 | (controller->ucFanParameters & |
|
| - | 2295 | ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with"); |
|
| - | 2296 | rdev->pm.int_thermal_type = THERMAL_TYPE_EXTERNAL_GPIO; |
|
| 2286 | (controller->ucType == |
2297 | } else if (controller->ucType == |
| 2287 | ATOM_PP_THERMALCONTROLLER_ADT7473_WITH_INTERNAL) || |
2298 | ATOM_PP_THERMALCONTROLLER_ADT7473_WITH_INTERNAL) { |
| - | 2299 | DRM_INFO("ADT7473 with internal thermal controller %s fan control\n", |
|
| - | 2300 | (controller->ucFanParameters & |
|
| - | 2301 | ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with"); |
|
| - | 2302 | rdev->pm.int_thermal_type = THERMAL_TYPE_ADT7473_WITH_INTERNAL; |
|
| 2288 | (controller->ucType == |
2303 | } else if (controller->ucType == |
| 2289 | ATOM_PP_THERMALCONTROLLER_EMC2103_WITH_INTERNAL)) { |
2304 | ATOM_PP_THERMALCONTROLLER_EMC2103_WITH_INTERNAL) { |
| 2290 | DRM_INFO("Special thermal controller config\n"); |
2305 | DRM_INFO("EMC2103 with internal thermal controller %s fan control\n", |
| - | 2306 | (controller->ucFanParameters & |
|
| - | 2307 | ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with"); |
|
| - | 2308 | rdev->pm.int_thermal_type = THERMAL_TYPE_EMC2103_WITH_INTERNAL; |
|
| 2291 | } else if (controller->ucType < ARRAY_SIZE(pp_lib_thermal_controller_names)) { |
2309 | } else if (controller->ucType < ARRAY_SIZE(pp_lib_thermal_controller_names)) { |
| 2292 | DRM_INFO("Possible %s thermal controller at 0x%02x %s fan control\n", |
2310 | DRM_INFO("Possible %s thermal controller at 0x%02x %s fan control\n", |
| 2293 | pp_lib_thermal_controller_names[controller->ucType], |
2311 | pp_lib_thermal_controller_names[controller->ucType], |
| 2294 | controller->ucI2cAddress >> 1, |
2312 | controller->ucI2cAddress >> 1, |
| 2295 | (controller->ucFanParameters & |
2313 | (controller->ucFanParameters & |
| 2296 | ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with"); |
2314 | ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with"); |
| - | 2315 | rdev->pm.int_thermal_type = THERMAL_TYPE_EXTERNAL; |
|
| 2297 | i2c_bus = radeon_lookup_i2c_gpio(rdev, controller->ucI2cLine); |
2316 | i2c_bus = radeon_lookup_i2c_gpio(rdev, controller->ucI2cLine); |
| 2298 | rdev->pm.i2c_bus = radeon_i2c_lookup(rdev, &i2c_bus); |
2317 | rdev->pm.i2c_bus = radeon_i2c_lookup(rdev, &i2c_bus); |
| 2299 | if (rdev->pm.i2c_bus) { |
2318 | if (rdev->pm.i2c_bus) { |
| 2300 | struct i2c_board_info info = { }; |
2319 | struct i2c_board_info info = { }; |
| 2301 | const char *name = pp_lib_thermal_controller_names[controller->ucType]; |
2320 | const char *name = pp_lib_thermal_controller_names[controller->ucType]; |