diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c
index da041a4..b3276bf 100644
--- a/drivers/gpu/drm/radeon/rv770_dpm.c
+++ b/drivers/gpu/drm/radeon/rv770_dpm.c
@@ -1729,9 +1729,9 @@ void rv770_program_response_times(struct radeon_device *rdev)
 				      RV770_SMC_SOFT_REGISTER_delay_acpi, acpi_dly);
 	rv770_write_smc_soft_register(rdev,
 				      RV770_SMC_SOFT_REGISTER_mclk_chg_timeout, vbi_dly);
-#if 0
+#if 1
 	/* XXX look up hw revision */
-	if (WEKIVA_A21)
+//	if (WEKIVA_A21)
 		rv770_write_smc_soft_register(rdev,
 					      RV770_SMC_SOFT_REGISTER_baby_step_timer,
 					      0x10);
@@ -2335,6 +2335,9 @@ void rv770_get_engine_memory_ss(struct radeon_device *rdev)
 		pi->mclk_ss = false;
 	}
 
+	pi->sclk_ss = false;
+	pi->mclk_ss = false;
+
 	if (pi->sclk_ss || pi->mclk_ss)
 		pi->dynamic_ss = true;
 	else
@@ -2400,12 +2403,12 @@ int rv770_dpm_init(struct radeon_device *rdev)
 
 	pi->power_gating = false;
 
-	pi->gfx_clock_gating = true;
+	pi->gfx_clock_gating = false;
 
-	pi->mg_clock_gating = true;
-	pi->mgcgtssm = true;
+	pi->mg_clock_gating = false;
+	pi->mgcgtssm = false;
 
-	pi->dynamic_pcie_gen2 = true;
+	pi->dynamic_pcie_gen2 = false;
 
 	if (rdev->pm.int_thermal_type != THERMAL_TYPE_NONE)
 		pi->thermal_protection = true;