diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2013-10-23 18:35:43 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2013-11-01 12:43:21 -0400 |
commit | 033a37df15182fd3effeaea166fcd28de5df5e70 (patch) | |
tree | 40f87453a8e64abbb4ef6d64f783c8523960d259 /drivers/gpu/drm/radeon/radeon_pm.c | |
parent | 846ae41ae99d314bf2a02784152208a6ddf7eddc (diff) |
drm/radeon/dpm: only print dpm debugging messages when radeon_dpm=1
Avoids spamming the system log for chips where dpm is enabled by
default, but prints then messages when users force it on for other
asics.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_pm.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_pm.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index ac07ad1d4f8c..cdeb3f8a2a30 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c | |||
@@ -881,11 +881,12 @@ static void radeon_dpm_change_power_state_locked(struct radeon_device *rdev) | |||
881 | } | 881 | } |
882 | } | 882 | } |
883 | 883 | ||
884 | printk("switching from power state:\n"); | 884 | if (radeon_dpm == 1) { |
885 | radeon_dpm_print_power_state(rdev, rdev->pm.dpm.current_ps); | 885 | printk("switching from power state:\n"); |
886 | printk("switching to power state:\n"); | 886 | radeon_dpm_print_power_state(rdev, rdev->pm.dpm.current_ps); |
887 | radeon_dpm_print_power_state(rdev, rdev->pm.dpm.requested_ps); | 887 | printk("switching to power state:\n"); |
888 | 888 | radeon_dpm_print_power_state(rdev, rdev->pm.dpm.requested_ps); | |
889 | } | ||
889 | mutex_lock(&rdev->ddev->struct_mutex); | 890 | mutex_lock(&rdev->ddev->struct_mutex); |
890 | down_write(&rdev->pm.mclk_lock); | 891 | down_write(&rdev->pm.mclk_lock); |
891 | mutex_lock(&rdev->ring_lock); | 892 | mutex_lock(&rdev->ring_lock); |
@@ -1176,7 +1177,8 @@ static int radeon_pm_init_dpm(struct radeon_device *rdev) | |||
1176 | mutex_lock(&rdev->pm.mutex); | 1177 | mutex_lock(&rdev->pm.mutex); |
1177 | radeon_dpm_init(rdev); | 1178 | radeon_dpm_init(rdev); |
1178 | rdev->pm.dpm.current_ps = rdev->pm.dpm.requested_ps = rdev->pm.dpm.boot_ps; | 1179 | rdev->pm.dpm.current_ps = rdev->pm.dpm.requested_ps = rdev->pm.dpm.boot_ps; |
1179 | radeon_dpm_print_power_states(rdev); | 1180 | if (radeon_dpm == 1) |
1181 | radeon_dpm_print_power_states(rdev); | ||
1180 | radeon_dpm_setup_asic(rdev); | 1182 | radeon_dpm_setup_asic(rdev); |
1181 | ret = radeon_dpm_enable(rdev); | 1183 | ret = radeon_dpm_enable(rdev); |
1182 | mutex_unlock(&rdev->pm.mutex); | 1184 | mutex_unlock(&rdev->pm.mutex); |