diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2010-05-07 15:10:16 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-05-18 04:21:52 -0400 |
commit | ce8f53709bf440100cb9d31b1303291551cf517f (patch) | |
tree | 6785882522ae04486ae900b5c8dbc700dadad2f3 /drivers/gpu/drm/radeon/r300.c | |
parent | d7311171c4cc8d6231427f7ac5056b939a184b80 (diff) |
drm/radeon/kms/pm: rework power management
- Separate dynpm and profile based power management methods. You can select the pm method
by echoing the selected method ("dynpm" or "profile") to power_method in sysfs.
- Expose basic 4 profile in profile method
"default" - default clocks
"auto" - select between low and high based on ac/dc state
"low" - DC, low power mode
"high" - AC, performance mode
The current base profile is "default", but it should switched to "auto" once we've tested
on more systems. Switching the state is a matter of echoing the requested profile to
power_profile in sysfs. The lowest power states are selected automatically when dpms turns
the monitors off in all states but default.
- Remove dynamic fence-based reclocking for the moment. We can revisit this later once we
have basic pm in.
- Move pm init/fini to modesetting path. pm is tightly coupled with display state. Make sure
display side is initialized before pm.
- Add pm suspend/resume functions to make sure pm state is properly reinitialized on resume.
- Remove dynpm module option. It's now selectable via sysfs.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r300.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r300.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 5d622cb39b33..5c54db51de85 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c | |||
@@ -1345,7 +1345,6 @@ int r300_suspend(struct radeon_device *rdev) | |||
1345 | 1345 | ||
1346 | void r300_fini(struct radeon_device *rdev) | 1346 | void r300_fini(struct radeon_device *rdev) |
1347 | { | 1347 | { |
1348 | radeon_pm_fini(rdev); | ||
1349 | r100_cp_fini(rdev); | 1348 | r100_cp_fini(rdev); |
1350 | r100_wb_fini(rdev); | 1349 | r100_wb_fini(rdev); |
1351 | r100_ib_fini(rdev); | 1350 | r100_ib_fini(rdev); |
@@ -1401,8 +1400,6 @@ int r300_init(struct radeon_device *rdev) | |||
1401 | r300_errata(rdev); | 1400 | r300_errata(rdev); |
1402 | /* Initialize clocks */ | 1401 | /* Initialize clocks */ |
1403 | radeon_get_clock_info(rdev->ddev); | 1402 | radeon_get_clock_info(rdev->ddev); |
1404 | /* Initialize power management */ | ||
1405 | radeon_pm_init(rdev); | ||
1406 | /* initialize AGP */ | 1403 | /* initialize AGP */ |
1407 | if (rdev->flags & RADEON_IS_AGP) { | 1404 | if (rdev->flags & RADEON_IS_AGP) { |
1408 | r = radeon_agp_init(rdev); | 1405 | r = radeon_agp_init(rdev); |