| 447,6 → 447,13 |
|---|
| } |
| } |
| |
| /* Fujitsu D3003-S2 board lists DVI-I as DVI-I and VGA */ |
| if ((dev->pdev->device == 0x9805) && |
| (dev->pdev->subsystem_vendor == 0x1734) && |
| (dev->pdev->subsystem_device == 0x11bd)) { |
| if (*connector_type == DRM_MODE_CONNECTOR_VGA) |
| return false; |
| } |
| |
| return true; |
| } |
| 2281,13 → 2288,24 |
|---|
| (controller->ucFanParameters & |
| ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with"); |
| rdev->pm.int_thermal_type = THERMAL_TYPE_KV; |
| } else if ((controller->ucType == |
| ATOM_PP_THERMALCONTROLLER_EXTERNAL_GPIO) || |
| (controller->ucType == |
| ATOM_PP_THERMALCONTROLLER_ADT7473_WITH_INTERNAL) || |
| (controller->ucType == |
| ATOM_PP_THERMALCONTROLLER_EMC2103_WITH_INTERNAL)) { |
| DRM_INFO("Special thermal controller config\n"); |
| } else if (controller->ucType == |
| ATOM_PP_THERMALCONTROLLER_EXTERNAL_GPIO) { |
| DRM_INFO("External GPIO thermal controller %s fan control\n", |
| (controller->ucFanParameters & |
| ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with"); |
| rdev->pm.int_thermal_type = THERMAL_TYPE_EXTERNAL_GPIO; |
| } else if (controller->ucType == |
| ATOM_PP_THERMALCONTROLLER_ADT7473_WITH_INTERNAL) { |
| DRM_INFO("ADT7473 with internal thermal controller %s fan control\n", |
| (controller->ucFanParameters & |
| ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with"); |
| rdev->pm.int_thermal_type = THERMAL_TYPE_ADT7473_WITH_INTERNAL; |
| } else if (controller->ucType == |
| ATOM_PP_THERMALCONTROLLER_EMC2103_WITH_INTERNAL) { |
| DRM_INFO("EMC2103 with internal thermal controller %s fan control\n", |
| (controller->ucFanParameters & |
| ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with"); |
| rdev->pm.int_thermal_type = THERMAL_TYPE_EMC2103_WITH_INTERNAL; |
| } else if (controller->ucType < ARRAY_SIZE(pp_lib_thermal_controller_names)) { |
| DRM_INFO("Possible %s thermal controller at 0x%02x %s fan control\n", |
| pp_lib_thermal_controller_names[controller->ucType], |
| 2294,6 → 2312,7 |
|---|
| controller->ucI2cAddress >> 1, |
| (controller->ucFanParameters & |
| ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with"); |
| rdev->pm.int_thermal_type = THERMAL_TYPE_EXTERNAL; |
| i2c_bus = radeon_lookup_i2c_gpio(rdev, controller->ucI2cLine); |
| rdev->pm.i2c_bus = radeon_i2c_lookup(rdev, &i2c_bus); |
| if (rdev->pm.i2c_bus) { |