rpms/kernel/devel drm-provide-knob-to-enable-radeon_pm.patch, NONE, 1.1 kernel.spec, 1.2024, 1.2025

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27092

Modified Files:
	kernel.spec 
Added Files:
	drm-provide-knob-to-enable-radeon_pm.patch 
Log Message:
* Sun Jun 13 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-34
- Provide a knob to enable radeon_pm to allow users to test
  that functionality. Add radeon.pm=1 to your kernel cmdline
  in order to enable it. (It still defaults to off though.)


drm-provide-knob-to-enable-radeon_pm.patch:
 radeon.h     |    1 +
 radeon_drv.c |    4 ++++
 radeon_pm.c  |    2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE drm-provide-knob-to-enable-radeon_pm.patch ---
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 5f96fe8..5b23cb9 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -92,6 +92,7 @@ extern int radeon_new_pll;
 extern int radeon_audio;
 extern int radeon_disp_priority;
 extern int radeon_hw_i2c;
+extern int radeon_pm;
 
 /*
  * Copy from radeon_drv.h so we don't have to include both and have conflicting
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 902d173..76be38d 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -95,6 +95,7 @@ int radeon_new_pll = -1;
 int radeon_audio = 1;
 int radeon_disp_priority = 0;
 int radeon_hw_i2c = 0;
+int radeon_pm = 0;
 
 MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
 module_param_named(no_wb, radeon_no_wb, int, 0444);
@@ -141,6 +142,9 @@ module_param_named(disp_priority, radeon_disp_priority, int, 0444);
 MODULE_PARM_DESC(hw_i2c, "hw i2c engine enable (0 = disable)");
 module_param_named(hw_i2c, radeon_hw_i2c, int, 0444);
 
+MODULE_PARM_DESC(pm, "enable power management (0 = disable)");
+module_param_named(pm, radeon_pm, int, 0444);
+
 static int radeon_suspend(struct drm_device *dev, pm_message_t state)
 {
 	drm_radeon_private_t *dev_priv = dev->dev_private;
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 4d3c1e4..0f902e4 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -411,7 +411,7 @@ int radeon_pm_init(struct radeon_device *rdev)
 		rdev->pm.current_clock_mode_index = -1;
 	}
 
-	if (0 && rdev->pm.num_power_states > 1) {
+	if (radeon_pm && rdev->pm.num_power_states > 1) {
 		if (rdev->pm.pm_method == PM_METHOD_PROFILE) {
 			mutex_lock(&rdev->pm.mutex);
 			rdev->pm.profile = PM_PROFILE_DEFAULT;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2024
retrieving revision 1.2025
diff -u -p -r1.2024 -r1.2025
--- kernel.spec	13 Jun 2010 11:30:56 -0000	1.2024
+++ kernel.spec	13 Jun 2010 11:44:28 -0000	1.2025
@@ -681,6 +681,7 @@ Patch1555: fix_xen_guest_on_old_EC2.patc
 
 # DRM
 Patch1800: drm-next.patch
+Patch1801: drm-provide-knob-to-enable-radeon_pm.patch
 # nouveau + drm fixes
 Patch1815: drm-nouveau-drm-fixed-header.patch
 Patch1819: drm-intel-big-hammer.patch
@@ -1285,6 +1286,7 @@ ApplyPatch virt_console-rollup.patch
 ApplyPatch fix_xen_guest_on_old_EC2.patch
 
 ApplyPatch drm-next.patch
+ApplyPatch drm-provide-knob-to-enable-radeon_pm.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch drm-nouveau-drm-fixed-header.patch
@@ -1971,6 +1973,11 @@ fi
 #                 ||     ||
 
 %changelog
+* Sun Jun 13 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-34
+- Provide a knob to enable radeon_pm to allow users to test
+  that functionality. Add radeon.pm=1 to your kernel cmdline
+  in order to enable it. (It still defaults to off though.)
+
 * Sun Jun 13 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-33
 - Update drm-next to include fixes since 2.6.35-rc1.