diff options
| -rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 16 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 14 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_pm.c | 16 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/rs600.c | 2 |
4 files changed, 24 insertions, 24 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 4c5d21bfa2c4..9a59ba46f078 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c | |||
| @@ -141,13 +141,13 @@ void r100_pm_get_dynpm_state(struct radeon_device *rdev) | |||
| 141 | /* only one clock mode per power state */ | 141 | /* only one clock mode per power state */ |
| 142 | rdev->pm.requested_clock_mode_index = 0; | 142 | rdev->pm.requested_clock_mode_index = 0; |
| 143 | 143 | ||
| 144 | DRM_INFO("Requested: e: %d m: %d p: %d\n", | 144 | DRM_DEBUG("Requested: e: %d m: %d p: %d\n", |
| 145 | rdev->pm.power_state[rdev->pm.requested_power_state_index]. | 145 | rdev->pm.power_state[rdev->pm.requested_power_state_index]. |
| 146 | clock_info[rdev->pm.requested_clock_mode_index].sclk, | 146 | clock_info[rdev->pm.requested_clock_mode_index].sclk, |
| 147 | rdev->pm.power_state[rdev->pm.requested_power_state_index]. | 147 | rdev->pm.power_state[rdev->pm.requested_power_state_index]. |
| 148 | clock_info[rdev->pm.requested_clock_mode_index].mclk, | 148 | clock_info[rdev->pm.requested_clock_mode_index].mclk, |
| 149 | rdev->pm.power_state[rdev->pm.requested_power_state_index]. | 149 | rdev->pm.power_state[rdev->pm.requested_power_state_index]. |
| 150 | pcie_lanes); | 150 | pcie_lanes); |
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | void r100_pm_init_profile(struct radeon_device *rdev) | 153 | void r100_pm_init_profile(struct radeon_device *rdev) |
| @@ -266,7 +266,7 @@ void r100_pm_misc(struct radeon_device *rdev) | |||
| 266 | rdev->pm.power_state[rdev->pm.current_power_state_index].pcie_lanes)) { | 266 | rdev->pm.power_state[rdev->pm.current_power_state_index].pcie_lanes)) { |
| 267 | radeon_set_pcie_lanes(rdev, | 267 | radeon_set_pcie_lanes(rdev, |
| 268 | ps->pcie_lanes); | 268 | ps->pcie_lanes); |
| 269 | DRM_INFO("Setting: p: %d\n", ps->pcie_lanes); | 269 | DRM_DEBUG("Setting: p: %d\n", ps->pcie_lanes); |
| 270 | } | 270 | } |
| 271 | } | 271 | } |
| 272 | 272 | ||
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 618d76d366a4..0fef3351660c 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
| @@ -251,13 +251,13 @@ void r600_pm_get_dynpm_state(struct radeon_device *rdev) | |||
| 251 | } | 251 | } |
| 252 | } | 252 | } |
| 253 | 253 | ||
| 254 | DRM_INFO("Requested: e: %d m: %d p: %d\n", | 254 | DRM_DEBUG("Requested: e: %d m: %d p: %d\n", |
| 255 | rdev->pm.power_state[rdev->pm.requested_power_state_index]. | 255 | rdev->pm.power_state[rdev->pm.requested_power_state_index]. |
| 256 | clock_info[rdev->pm.requested_clock_mode_index].sclk, | 256 | clock_info[rdev->pm.requested_clock_mode_index].sclk, |
| 257 | rdev->pm.power_state[rdev->pm.requested_power_state_index]. | 257 | rdev->pm.power_state[rdev->pm.requested_power_state_index]. |
| 258 | clock_info[rdev->pm.requested_clock_mode_index].mclk, | 258 | clock_info[rdev->pm.requested_clock_mode_index].mclk, |
| 259 | rdev->pm.power_state[rdev->pm.requested_power_state_index]. | 259 | rdev->pm.power_state[rdev->pm.requested_power_state_index]. |
| 260 | pcie_lanes); | 260 | pcie_lanes); |
| 261 | } | 261 | } |
| 262 | 262 | ||
| 263 | static int r600_pm_get_type_index(struct radeon_device *rdev, | 263 | static int r600_pm_get_type_index(struct radeon_device *rdev, |
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index 1827317704a2..c88edae33deb 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c | |||
| @@ -52,9 +52,9 @@ static int radeon_acpi_event(struct notifier_block *nb, | |||
| 52 | 52 | ||
| 53 | if (strcmp(entry->device_class, ACPI_AC_CLASS) == 0) { | 53 | if (strcmp(entry->device_class, ACPI_AC_CLASS) == 0) { |
| 54 | if (power_supply_is_system_supplied() > 0) | 54 | if (power_supply_is_system_supplied() > 0) |
| 55 | DRM_INFO("pm: AC\n"); | 55 | DRM_DEBUG("pm: AC\n"); |
| 56 | else | 56 | else |
| 57 | DRM_INFO("pm: DC\n"); | 57 | DRM_DEBUG("pm: DC\n"); |
| 58 | 58 | ||
| 59 | if (rdev->pm.pm_method == PM_METHOD_PROFILE) { | 59 | if (rdev->pm.pm_method == PM_METHOD_PROFILE) { |
| 60 | if (rdev->pm.profile == PM_PROFILE_AUTO) { | 60 | if (rdev->pm.profile == PM_PROFILE_AUTO) { |
| @@ -183,7 +183,7 @@ static void radeon_set_power_state(struct radeon_device *rdev) | |||
| 183 | radeon_set_engine_clock(rdev, sclk); | 183 | radeon_set_engine_clock(rdev, sclk); |
| 184 | radeon_pm_debug_check_in_vbl(rdev, true); | 184 | radeon_pm_debug_check_in_vbl(rdev, true); |
| 185 | rdev->pm.current_sclk = sclk; | 185 | rdev->pm.current_sclk = sclk; |
| 186 | DRM_INFO("Setting: e: %d\n", sclk); | 186 | DRM_DEBUG("Setting: e: %d\n", sclk); |
| 187 | } | 187 | } |
| 188 | 188 | ||
| 189 | /* set memory clock */ | 189 | /* set memory clock */ |
| @@ -192,7 +192,7 @@ static void radeon_set_power_state(struct radeon_device *rdev) | |||
| 192 | radeon_set_memory_clock(rdev, mclk); | 192 | radeon_set_memory_clock(rdev, mclk); |
| 193 | radeon_pm_debug_check_in_vbl(rdev, true); | 193 | radeon_pm_debug_check_in_vbl(rdev, true); |
| 194 | rdev->pm.current_mclk = mclk; | 194 | rdev->pm.current_mclk = mclk; |
| 195 | DRM_INFO("Setting: m: %d\n", mclk); | 195 | DRM_DEBUG("Setting: m: %d\n", mclk); |
| 196 | } | 196 | } |
| 197 | radeon_pm_finish(rdev); | 197 | radeon_pm_finish(rdev); |
| 198 | } else { | 198 | } else { |
| @@ -203,7 +203,7 @@ static void radeon_set_power_state(struct radeon_device *rdev) | |||
| 203 | radeon_set_engine_clock(rdev, sclk); | 203 | radeon_set_engine_clock(rdev, sclk); |
| 204 | radeon_pm_finish(rdev); | 204 | radeon_pm_finish(rdev); |
| 205 | rdev->pm.current_sclk = sclk; | 205 | rdev->pm.current_sclk = sclk; |
| 206 | DRM_INFO("Setting: e: %d\n", sclk); | 206 | DRM_DEBUG("Setting: e: %d\n", sclk); |
| 207 | } | 207 | } |
| 208 | /* set memory clock */ | 208 | /* set memory clock */ |
| 209 | if (rdev->asic->set_memory_clock && (mclk != rdev->pm.current_mclk)) { | 209 | if (rdev->asic->set_memory_clock && (mclk != rdev->pm.current_mclk)) { |
| @@ -212,14 +212,14 @@ static void radeon_set_power_state(struct radeon_device *rdev) | |||
| 212 | radeon_set_memory_clock(rdev, mclk); | 212 | radeon_set_memory_clock(rdev, mclk); |
| 213 | radeon_pm_finish(rdev); | 213 | radeon_pm_finish(rdev); |
| 214 | rdev->pm.current_mclk = mclk; | 214 | rdev->pm.current_mclk = mclk; |
| 215 | DRM_INFO("Setting: m: %d\n", mclk); | 215 | DRM_DEBUG("Setting: m: %d\n", mclk); |
| 216 | } | 216 | } |
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | rdev->pm.current_power_state_index = rdev->pm.requested_power_state_index; | 219 | rdev->pm.current_power_state_index = rdev->pm.requested_power_state_index; |
| 220 | rdev->pm.current_clock_mode_index = rdev->pm.requested_clock_mode_index; | 220 | rdev->pm.current_clock_mode_index = rdev->pm.requested_clock_mode_index; |
| 221 | } else | 221 | } else |
| 222 | DRM_INFO("pm: GUI not idle!!!\n"); | 222 | DRM_DEBUG("pm: GUI not idle!!!\n"); |
| 223 | } | 223 | } |
| 224 | 224 | ||
| 225 | static void radeon_pm_set_clocks(struct radeon_device *rdev) | 225 | static void radeon_pm_set_clocks(struct radeon_device *rdev) |
| @@ -624,7 +624,7 @@ static bool radeon_pm_debug_check_in_vbl(struct radeon_device *rdev, bool finish | |||
| 624 | bool in_vbl = radeon_pm_in_vbl(rdev); | 624 | bool in_vbl = radeon_pm_in_vbl(rdev); |
| 625 | 625 | ||
| 626 | if (in_vbl == false) | 626 | if (in_vbl == false) |
| 627 | DRM_INFO("not in vbl for pm change %08x at %s\n", stat_crtc, | 627 | DRM_DEBUG("not in vbl for pm change %08x at %s\n", stat_crtc, |
| 628 | finish ? "exit" : "entry"); | 628 | finish ? "exit" : "entry"); |
| 629 | return in_vbl; | 629 | return in_vbl; |
| 630 | } | 630 | } |
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index e8c68e9c0a1e..79887cac5b54 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c | |||
| @@ -135,7 +135,7 @@ void rs600_pm_misc(struct radeon_device *rdev) | |||
| 135 | rdev->pm.power_state[rdev->pm.current_power_state_index].pcie_lanes)) { | 135 | rdev->pm.power_state[rdev->pm.current_power_state_index].pcie_lanes)) { |
| 136 | radeon_set_pcie_lanes(rdev, | 136 | radeon_set_pcie_lanes(rdev, |
| 137 | ps->pcie_lanes); | 137 | ps->pcie_lanes); |
| 138 | DRM_INFO("Setting: p: %d\n", ps->pcie_lanes); | 138 | DRM_DEBUG("Setting: p: %d\n", ps->pcie_lanes); |
| 139 | } | 139 | } |
| 140 | } | 140 | } |
| 141 | 141 | ||
