radeon: only enable dynclks if asked for

diff --git a/linux-core/radeon_drv.c b/linux-core/radeon_drv.c
index f1fe30121165e02e784a8c01ba412d9be7b14d9e..daa335b9c6d7be975bd641dcdb5ec33f7113310c 100644 (file)
--- a/linux-core/radeon_drv.c
+++ b/linux-core/radeon_drv.c
@@ -37,7 +37,7 @@
 #include "drm_pciids.h"
 
 int radeon_no_wb;
-int radeon_dynclks = 1;
+int radeon_dynclks = -1;
 int radeon_r4xx_atom = 0;
 int radeon_agpmode = 0;
 

diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 942ccc5117a84fcfe7516adfee2f3f963ccd14df..3f8f0c94bb0517fce626ac4ba0835eadb1cc3063 100644 (file)
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -2601,19 +2601,23 @@ int radeon_static_clocks_init(struct drm_device *dev)
 {
        drm_radeon_private_t *dev_priv = dev->dev_private;
 
-       if (dev_priv->chip_family == CHIP_RS400 ||
-           dev_priv->chip_family == CHIP_RS480)
-               radeon_dynclks = 0;
-
-       if ((dev_priv->flags & RADEON_IS_MOBILITY) && !radeon_is_avivo(dev_priv)) {
-               radeon_set_dynamic_clock(dev, radeon_dynclks);
-       } else if (radeon_is_avivo(dev_priv)) {
-               if (radeon_dynclks) {
-                       radeon_atom_static_pwrmgt_setup(dev, 1);
-                       radeon_atom_dyn_clk_setup(dev, 1);
+       if (radeon_dynclks != -1) {
+
+               if (dev_priv->chip_family == CHIP_RS400 ||
+                   dev_priv->chip_family == CHIP_RS480)
+                       radeon_dynclks = 0;
+
+               if ((dev_priv->flags & RADEON_IS_MOBILITY) && !radeon_is_avivo(dev_priv)) {
+                       radeon_set_dynamic_clock(dev, radeon_dynclks);
+               } else if (radeon_is_avivo(dev_priv)) {
+                       if (radeon_dynclks) {
+                               radeon_atom_static_pwrmgt_setup(dev, 1);
+                               radeon_atom_dyn_clk_setup(dev, 1);
+                       }
                }
        }
-       radeon_force_some_clocks(dev);
+       if (radeon_is_r300(dev_priv) || radeon_is_rv100(dev_priv))
+               radeon_force_some_clocks(dev);
        return 0;
 }