openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/radeon/dpm: add infrastructure to support debugfs info 

This lays the frameworks to report realtime power level
feedback.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2013-06-28 09:28:39 -04:00
parent 7ad8d0687b
commit 1316b79256
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/radeon/radeon.h
View File

@ -1667,6 +1667,7 @@ struct radeon_asic {
u32 (*get_sclk)(struct radeon_device *rdev, bool low); u32 (*get_sclk)(struct radeon_device *rdev, bool low);
u32 (*get_mclk)(struct radeon_device *rdev, bool low); u32 (*get_mclk)(struct radeon_device *rdev, bool low);
void (*print_power_state)(struct radeon_device *rdev, struct radeon_ps *ps); void (*print_power_state)(struct radeon_device *rdev, struct radeon_ps *ps);
void (*debugfs_print_current_performance_level)(struct radeon_device *rdev, struct seq_file *m);
} dpm; } dpm;
/* pageflipping */ /* pageflipping */
struct { struct {
@ -2433,6 +2434,7 @@ void radeon_ring_write(struct radeon_ring *ring, uint32_t v);
#define radeon_dpm_get_sclk(rdev, l) rdev->asic->dpm.get_sclk((rdev), (l)) #define radeon_dpm_get_sclk(rdev, l) rdev->asic->dpm.get_sclk((rdev), (l))
#define radeon_dpm_get_mclk(rdev, l) rdev->asic->dpm.get_mclk((rdev), (l)) #define radeon_dpm_get_mclk(rdev, l) rdev->asic->dpm.get_mclk((rdev), (l))
#define radeon_dpm_print_power_state(rdev, ps) rdev->asic->dpm.print_power_state((rdev), (ps)) #define radeon_dpm_print_power_state(rdev, ps) rdev->asic->dpm.print_power_state((rdev), (ps))
#define radeon_dpm_debugfs_print_current_performance_level(rdev, m) rdev->asic->dpm.debugfs_print_current_performance_level((rdev), (m))
/* Common functions */ /* Common functions */
/* AGP */ /* AGP */

40
drivers/gpu/drm/radeon/radeon_pm.c
View File

@ -1062,6 +1062,11 @@ static int radeon_pm_init_dpm(struct radeon_device *rdev)
ret = device_create_file(rdev->dev, &dev_attr_power_method); ret = device_create_file(rdev->dev, &dev_attr_power_method);
if (ret) if (ret)
DRM_ERROR("failed to create device file for power method\n"); DRM_ERROR("failed to create device file for power method\n");
if (radeon_debugfs_pm_init(rdev)) {
DRM_ERROR("Failed to register debugfs file for dpm!\n");
}
DRM_INFO("radeon: dpm initialized\n"); DRM_INFO("radeon: dpm initialized\n");
} }
@ -1389,19 +1394,28 @@ static int radeon_debugfs_pm_info(struct seq_file *m, void *data)
struct drm_device *dev = node->minor->dev; struct drm_device *dev = node->minor->dev;
struct radeon_device *rdev = dev->dev_private; struct radeon_device *rdev = dev->dev_private;
seq_printf(m, "default engine clock: %u0 kHz\n", rdev->pm.default_sclk); if (rdev->pm.dpm_enabled) {
/* radeon_get_engine_clock is not reliable on APUs so just print the current clock */ mutex_lock(&rdev->pm.mutex);
if ((rdev->family >= CHIP_PALM) && (rdev->flags & RADEON_IS_IGP)) if (rdev->asic->dpm.debugfs_print_current_performance_level)
seq_printf(m, "current engine clock: %u0 kHz\n", rdev->pm.current_sclk); radeon_dpm_debugfs_print_current_performance_level(rdev, m);
else else
seq_printf(m, "current engine clock: %u0 kHz\n", radeon_get_engine_clock(rdev)); seq_printf(m, "Unsupported\n");
seq_printf(m, "default memory clock: %u0 kHz\n", rdev->pm.default_mclk); mutex_unlock(&rdev->pm.mutex);
if (rdev->asic->pm.get_memory_clock) } else {
seq_printf(m, "current memory clock: %u0 kHz\n", radeon_get_memory_clock(rdev)); seq_printf(m, "default engine clock: %u0 kHz\n", rdev->pm.default_sclk);
if (rdev->pm.current_vddc) /* radeon_get_engine_clock is not reliable on APUs so just print the current clock */
seq_printf(m, "voltage: %u mV\n", rdev->pm.current_vddc); if ((rdev->family >= CHIP_PALM) && (rdev->flags & RADEON_IS_IGP))
if (rdev->asic->pm.get_pcie_lanes) seq_printf(m, "current engine clock: %u0 kHz\n", rdev->pm.current_sclk);
seq_printf(m, "PCIE lanes: %d\n", radeon_get_pcie_lanes(rdev)); else
seq_printf(m, "current engine clock: %u0 kHz\n", radeon_get_engine_clock(rdev));
seq_printf(m, "default memory clock: %u0 kHz\n", rdev->pm.default_mclk);
if (rdev->asic->pm.get_memory_clock)
seq_printf(m, "current memory clock: %u0 kHz\n", radeon_get_memory_clock(rdev));
if (rdev->pm.current_vddc)
seq_printf(m, "voltage: %u mV\n", rdev->pm.current_vddc);
if (rdev->asic->pm.get_pcie_lanes)
seq_printf(m, "PCIE lanes: %d\n", radeon_get_pcie_lanes(rdev));
}
return 0; return 0;
} }