]> rtime.felk.cvut.cz Git - linux-imx.git/blobdiff - drivers/gpu/drm/radeon/ni_dpm.c
drm/radeon/dpm: re-enable state transitions for Cayman
[linux-imx.git] / drivers / gpu / drm / radeon / ni_dpm.c
index 5fd967987dc379438c5c5a45a08a4908ab9498dc..4712851808a3e13cec4d5485b8836041e503fe0c 100644 (file)
@@ -27,6 +27,7 @@
 #include "r600_dpm.h"
 #include "ni_dpm.h"
 #include "atom.h"
+#include <linux/math64.h>
 
 #define MC_CG_ARB_FREQ_F0           0x0a
 #define MC_CG_ARB_FREQ_F1           0x0b
@@ -718,7 +719,7 @@ static const u32 cayman_sysls_enable[] =
 struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev);
 struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev);
 
-static struct ni_power_info *ni_get_pi(struct radeon_device *rdev)
+struct ni_power_info *ni_get_pi(struct radeon_device *rdev)
 {
         struct ni_power_info *pi = rdev->pm.dpm.priv;
 
@@ -732,50 +733,25 @@ struct ni_ps *ni_get_ps(struct radeon_ps *rps)
        return ps;
 }
 
-/* XXX: fix for kernel use  */
-#if 0
-static double ni_exp(double x)
-{
-       int count = 1;
-       double sum = 1.0, term, tolerance = 0.000000001, y = x;
-
-       if (x < 0)
-               y = -1 * x;
-       term  = y;
-
-       while (term >= tolerance) {
-               sum = sum + term;
-               count = count + 1;
-               term  = term * (y / count);
-       }
-
-       if (x < 0)
-               sum = 1.0 / sum;
-
-       return sum;
-}
-#endif
-
 static void ni_calculate_leakage_for_v_and_t_formula(const struct ni_leakage_coeffients *coeff,
                                                     u16 v, s32 t,
                                                     u32 ileakage,
                                                     u32 *leakage)
 {
-/* XXX: fix for kernel use  */
-#if 0
-       double kt, kv, leakage_w, i_leakage, vddc, temperature;
+       s64 kt, kv, leakage_w, i_leakage, vddc, temperature;
 
-       i_leakage   = ((double)ileakage) / 1000;
-       vddc        = ((double)v) / 1000;
-       temperature = ((double)t) / 1000;
+       i_leakage = div64_s64(drm_int2fixp(ileakage), 1000);
+       vddc = div64_s64(drm_int2fixp(v), 1000);
+       temperature = div64_s64(drm_int2fixp(t), 1000);
 
-       kt = (((double)(coeff->at)) / 1000) * ni_exp((((double)(coeff->bt)) / 1000) * temperature);
-       kv = (((double)(coeff->av)) / 1000) * ni_exp((((double)(coeff->bv)) / 1000) * vddc);
+       kt = drm_fixp_mul(div64_s64(drm_int2fixp(coeff->at), 1000),
+                         drm_fixp_exp(drm_fixp_mul(div64_s64(drm_int2fixp(coeff->bt), 1000), temperature)));
+       kv = drm_fixp_mul(div64_s64(drm_int2fixp(coeff->av), 1000),
+                         drm_fixp_exp(drm_fixp_mul(div64_s64(drm_int2fixp(coeff->bv), 1000), vddc)));
 
-       leakage_w = i_leakage * kt * kv * vddc;
+       leakage_w = drm_fixp_mul(drm_fixp_mul(drm_fixp_mul(i_leakage, kt), kv), vddc);
 
-       *leakage = (u32)(leakage_w * 1000);
-#endif
+       *leakage = drm_fixp2int(leakage_w * 1000);
 }
 
 static void ni_calculate_leakage_for_v_and_t(struct radeon_device *rdev,
@@ -791,7 +767,6 @@ static void ni_calculate_leakage_for_v_and_t(struct radeon_device *rdev,
 static void ni_apply_state_adjust_rules(struct radeon_device *rdev,
                                        struct radeon_ps *rps)
 {
-       struct ni_power_info *ni_pi = ni_get_pi(rdev);
        struct ni_ps *ps = ni_get_ps(rps);
        struct radeon_clock_and_voltage_limits *max_limits;
        bool disable_mclk_switching;
@@ -799,11 +774,6 @@ static void ni_apply_state_adjust_rules(struct radeon_device *rdev,
        u16 vddc, vddci;
        int i;
 
-       /* point to the hw copy since this function will modify the ps */
-       ni_pi->hw_ps = *ps;
-       rdev->pm.dpm.hw_ps.ps_priv = &ni_pi->hw_ps;
-       ps = &ni_pi->hw_ps;
-
        if (rdev->pm.dpm.new_active_crtc_count > 1)
                disable_mclk_switching = true;
        else
@@ -896,7 +866,9 @@ static void ni_apply_state_adjust_rules(struct radeon_device *rdev,
                btc_apply_voltage_dependency_rules(&rdev->pm.dpm.dyn_state.vddc_dependency_on_mclk,
                                                   ps->performance_levels[i].mclk,
                                                   max_limits->vddc,  &ps->performance_levels[i].vddc);
-               /* XXX validate the voltage required for display */
+               btc_apply_voltage_dependency_rules(&rdev->pm.dpm.dyn_state.vddc_dependency_on_dispclk,
+                                                  rdev->clock.current_dispclk,
+                                                  max_limits->vddc,  &ps->performance_levels[i].vddc);
        }
 
        for (i = 0; i < ps->performance_level_count; i++) {
@@ -1064,7 +1036,6 @@ static int ni_restrict_performance_levels_before_switch(struct radeon_device *rd
                0 : -EINVAL;
 }
 
-#if 0
 static int ni_unrestrict_performance_levels_after_switch(struct radeon_device *rdev)
 {
        if (ni_send_msg_to_smc_with_parameter(rdev, PPSMC_MSG_SetForcedLevels, 0) != PPSMC_Result_OK)
@@ -1073,7 +1044,6 @@ static int ni_unrestrict_performance_levels_after_switch(struct radeon_device *r
        return (ni_send_msg_to_smc_with_parameter(rdev, PPSMC_MSG_SetEnabledLevels, 0) == PPSMC_Result_OK) ?
                0 : -EINVAL;
 }
-#endif
 
 static void ni_stop_smc(struct radeon_device *rdev)
 {
@@ -1499,8 +1469,8 @@ static int ni_populate_smc_tdp_limits(struct radeon_device *rdev,
        return 0;
 }
 
-static int ni_copy_and_switch_arb_sets(struct radeon_device *rdev,
-                                      u32 arb_freq_src, u32 arb_freq_dest)
+int ni_copy_and_switch_arb_sets(struct radeon_device *rdev,
+                               u32 arb_freq_src, u32 arb_freq_dest)
 {
        u32 mc_arb_dram_timing;
        u32 mc_arb_dram_timing2;
@@ -3503,6 +3473,42 @@ static void ni_enable_dynamic_pcie_gen2(struct radeon_device *rdev,
                 WREG32_P(GENERAL_PWRMGT, 0, ~ENABLE_GEN2PCIE);
 }
 
+void ni_set_uvd_clock_before_set_eng_clock(struct radeon_device *rdev,
+                                          struct radeon_ps *new_ps,
+                                          struct radeon_ps *old_ps)
+{
+       struct ni_ps *new_state = ni_get_ps(new_ps);
+       struct ni_ps *current_state = ni_get_ps(old_ps);
+
+       if ((new_ps->vclk == old_ps->vclk) &&
+           (new_ps->dclk == old_ps->dclk))
+               return;
+
+       if (new_state->performance_levels[new_state->performance_level_count - 1].sclk >=
+           current_state->performance_levels[current_state->performance_level_count - 1].sclk)
+               return;
+
+       radeon_set_uvd_clocks(rdev, new_ps->vclk, new_ps->dclk);
+}
+
+void ni_set_uvd_clock_after_set_eng_clock(struct radeon_device *rdev,
+                                         struct radeon_ps *new_ps,
+                                         struct radeon_ps *old_ps)
+{
+       struct ni_ps *new_state = ni_get_ps(new_ps);
+       struct ni_ps *current_state = ni_get_ps(old_ps);
+
+       if ((new_ps->vclk == old_ps->vclk) &&
+           (new_ps->dclk == old_ps->dclk))
+               return;
+
+       if (new_state->performance_levels[new_state->performance_level_count - 1].sclk <
+           current_state->performance_levels[current_state->performance_level_count - 1].sclk)
+               return;
+
+       radeon_set_uvd_clocks(rdev, new_ps->vclk, new_ps->dclk);
+}
+
 void ni_dpm_setup_asic(struct radeon_device *rdev)
 {
        struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);
@@ -3516,11 +3522,36 @@ void ni_dpm_setup_asic(struct radeon_device *rdev)
        rv770_enable_acpi_pm(rdev);
 }
 
+void ni_update_current_ps(struct radeon_device *rdev,
+                         struct radeon_ps *rps)
+{
+       struct ni_ps *new_ps = ni_get_ps(rps);
+       struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);
+        struct ni_power_info *ni_pi = ni_get_pi(rdev);
+
+       eg_pi->current_rps = *rps;
+       ni_pi->current_ps = *new_ps;
+       eg_pi->current_rps.ps_priv = &ni_pi->current_ps;
+}
+
+void ni_update_requested_ps(struct radeon_device *rdev,
+                           struct radeon_ps *rps)
+{
+       struct ni_ps *new_ps = ni_get_ps(rps);
+       struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);
+        struct ni_power_info *ni_pi = ni_get_pi(rdev);
+
+       eg_pi->requested_rps = *rps;
+       ni_pi->requested_ps = *new_ps;
+       eg_pi->requested_rps.ps_priv = &ni_pi->requested_ps;
+}
+
 int ni_dpm_enable(struct radeon_device *rdev)
 {
        struct rv7xx_power_info *pi = rv770_get_pi(rdev);
        struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);
        struct radeon_ps *boot_ps = rdev->pm.dpm.boot_ps;
+       int ret;
 
        if (pi->gfx_clock_gating)
                ni_cg_clockgating_default(rdev);
@@ -3532,10 +3563,17 @@ int ni_dpm_enable(struct radeon_device *rdev)
                ni_ls_clockgating_default(rdev);
        if (pi->voltage_control) {
                rv770_enable_voltage_control(rdev, true);
-               cypress_construct_voltage_tables(rdev);
+               ret = cypress_construct_voltage_tables(rdev);
+               if (ret) {
+                       DRM_ERROR("cypress_construct_voltage_tables failed\n");
+                       return ret;
+               }
+       }
+       if (eg_pi->dynamic_ac_timing) {
+               ret = ni_initialize_mc_reg_table(rdev);
+               if (ret)
+                       eg_pi->dynamic_ac_timing = false;
        }
-       if (eg_pi->dynamic_ac_timing)
-               ni_initialize_mc_reg_table(rdev);
        if (pi->dynamic_ss)
                cypress_enable_spread_spectrum(rdev, true);
        if (pi->thermal_protection)
@@ -3549,21 +3587,65 @@ int ni_dpm_enable(struct radeon_device *rdev)
        rv770_program_vc(rdev);
        if (pi->dynamic_pcie_gen2)
                ni_enable_dynamic_pcie_gen2(rdev, true);
-       if (rv770_upload_firmware(rdev))
-               return -EINVAL;
-       ni_process_firmware_header(rdev);
-       ni_initial_switch_from_arb_f0_to_f1(rdev);
-       ni_init_smc_table(rdev);
-       ni_init_smc_spll_table(rdev);
-       ni_init_arb_table_index(rdev);
-       if (eg_pi->dynamic_ac_timing)
-               ni_populate_mc_reg_table(rdev, boot_ps);
-       ni_initialize_smc_cac_tables(rdev);
-       ni_initialize_hardware_cac_manager(rdev);
-       ni_populate_smc_tdp_limits(rdev, boot_ps);
+       ret = rv770_upload_firmware(rdev);
+       if (ret) {
+               DRM_ERROR("rv770_upload_firmware failed\n");
+               return ret;
+       }
+       ret = ni_process_firmware_header(rdev);
+       if (ret) {
+               DRM_ERROR("ni_process_firmware_header failed\n");
+               return ret;
+       }
+       ret = ni_initial_switch_from_arb_f0_to_f1(rdev);
+       if (ret) {
+               DRM_ERROR("ni_initial_switch_from_arb_f0_to_f1 failed\n");
+               return ret;
+       }
+       ret = ni_init_smc_table(rdev);
+       if (ret) {
+               DRM_ERROR("ni_init_smc_table failed\n");
+               return ret;
+       }
+       ret = ni_init_smc_spll_table(rdev);
+       if (ret) {
+               DRM_ERROR("ni_init_smc_spll_table failed\n");
+               return ret;
+       }
+       ret = ni_init_arb_table_index(rdev);
+       if (ret) {
+               DRM_ERROR("ni_init_arb_table_index failed\n");
+               return ret;
+       }
+       if (eg_pi->dynamic_ac_timing) {
+               ret = ni_populate_mc_reg_table(rdev, boot_ps);
+               if (ret) {
+                       DRM_ERROR("ni_populate_mc_reg_table failed\n");
+                       return ret;
+               }
+       }
+       ret = ni_initialize_smc_cac_tables(rdev);
+       if (ret) {
+               DRM_ERROR("ni_initialize_smc_cac_tables failed\n");
+               return ret;
+       }
+       ret = ni_initialize_hardware_cac_manager(rdev);
+       if (ret) {
+               DRM_ERROR("ni_initialize_hardware_cac_manager failed\n");
+               return ret;
+       }
+       ret = ni_populate_smc_tdp_limits(rdev, boot_ps);
+       if (ret) {
+               DRM_ERROR("ni_populate_smc_tdp_limits failed\n");
+               return ret;
+       }
        ni_program_response_times(rdev);
        r7xx_start_smc(rdev);
-       cypress_notify_smc_display_change(rdev, false);
+       ret = cypress_notify_smc_display_change(rdev, false);
+       if (ret) {
+               DRM_ERROR("cypress_notify_smc_display_change failed\n");
+               return ret;
+       }
        cypress_enable_sclk_control(rdev, true);
        if (eg_pi->memory_transition)
                cypress_enable_mclk_control(rdev, true);
@@ -3579,7 +3661,9 @@ int ni_dpm_enable(struct radeon_device *rdev)
            r600_is_internal_thermal_sensor(rdev->pm.int_thermal_type)) {
                PPSMC_Result result;
 
-               rv770_set_thermal_temperature_range(rdev, R600_TEMP_RANGE_MIN, 0xff * 1000);
+               ret = rv770_set_thermal_temperature_range(rdev, R600_TEMP_RANGE_MIN, 0xff * 1000);
+               if (ret)
+                       return ret;
                rdev->irq.dpm_thermal = true;
                radeon_irq_set(rdev);
                result = rv770_send_msg_to_smc(rdev, PPSMC_MSG_EnableThermalInterrupt);
@@ -3590,6 +3674,8 @@ int ni_dpm_enable(struct radeon_device *rdev)
 
        rv770_enable_auto_throttle_source(rdev, RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL, true);
 
+       ni_update_current_ps(rdev, boot_ps);
+
        return 0;
 }
 
@@ -3627,17 +3713,43 @@ void ni_dpm_disable(struct radeon_device *rdev)
        btc_reset_to_default(rdev);
        ni_stop_smc(rdev);
        ni_force_switch_to_arb_f0(rdev);
+
+       ni_update_current_ps(rdev, boot_ps);
 }
 
-int ni_power_control_set_level(struct radeon_device *rdev)
+static int ni_power_control_set_level(struct radeon_device *rdev)
 {
        struct radeon_ps *new_ps = rdev->pm.dpm.requested_ps;
+       int ret;
 
-       ni_restrict_performance_levels_before_switch(rdev);
-       rv770_halt_smc(rdev);
-       ni_populate_smc_tdp_limits(rdev, new_ps);
-       rv770_resume_smc(rdev);
-       rv770_set_sw_state(rdev);
+       ret = ni_restrict_performance_levels_before_switch(rdev);
+       if (ret)
+               return ret;
+       ret = rv770_halt_smc(rdev);
+       if (ret)
+               return ret;
+       ret = ni_populate_smc_tdp_limits(rdev, new_ps);
+       if (ret)
+               return ret;
+       ret = rv770_resume_smc(rdev);
+       if (ret)
+               return ret;
+       ret = rv770_set_sw_state(rdev);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+int ni_dpm_pre_set_power_state(struct radeon_device *rdev)
+{
+       struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);
+       struct radeon_ps requested_ps = *rdev->pm.dpm.requested_ps;
+       struct radeon_ps *new_ps = &requested_ps;
+
+       ni_update_requested_ps(rdev, new_ps);
+
+       ni_apply_state_adjust_rules(rdev, &eg_pi->requested_rps);
 
        return 0;
 }
@@ -3645,37 +3757,96 @@ int ni_power_control_set_level(struct radeon_device *rdev)
 int ni_dpm_set_power_state(struct radeon_device *rdev)
 {
        struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);
-       struct radeon_ps *new_ps = rdev->pm.dpm.requested_ps;
+       struct radeon_ps *new_ps = &eg_pi->requested_rps;
+       struct radeon_ps *old_ps = &eg_pi->current_rps;
        int ret;
 
-       ni_apply_state_adjust_rules(rdev, new_ps);
-
-       ni_restrict_performance_levels_before_switch(rdev);
-       ni_enable_power_containment(rdev, new_ps, false);
-       ni_enable_smc_cac(rdev, new_ps, false);
-       rv770_halt_smc(rdev);
+       ret = ni_restrict_performance_levels_before_switch(rdev);
+       if (ret) {
+               DRM_ERROR("ni_restrict_performance_levels_before_switch failed\n");
+               return ret;
+       }
+       ni_set_uvd_clock_before_set_eng_clock(rdev, new_ps, old_ps);
+       ret = ni_enable_power_containment(rdev, new_ps, false);
+       if (ret) {
+               DRM_ERROR("ni_enable_power_containment failed\n");
+               return ret;
+       }
+       ret = ni_enable_smc_cac(rdev, new_ps, false);
+       if (ret) {
+               DRM_ERROR("ni_enable_smc_cac failed\n");
+               return ret;
+       }
+       ret = rv770_halt_smc(rdev);
+       if (ret) {
+               DRM_ERROR("rv770_halt_smc failed\n");
+               return ret;
+       }
        if (eg_pi->smu_uvd_hs)
                btc_notify_uvd_to_smc(rdev, new_ps);
-       ni_upload_sw_state(rdev, new_ps);
-       if (eg_pi->dynamic_ac_timing)
-               ni_upload_mc_reg_table(rdev, new_ps);
+       ret = ni_upload_sw_state(rdev, new_ps);
+       if (ret) {
+               DRM_ERROR("ni_upload_sw_state failed\n");
+               return ret;
+       }
+       if (eg_pi->dynamic_ac_timing) {
+               ret = ni_upload_mc_reg_table(rdev, new_ps);
+               if (ret) {
+                       DRM_ERROR("ni_upload_mc_reg_table failed\n");
+                       return ret;
+               }
+       }
        ret = ni_program_memory_timing_parameters(rdev, new_ps);
-       if (ret)
+       if (ret) {
+               DRM_ERROR("ni_program_memory_timing_parameters failed\n");
+               return ret;
+       }
+       ret = rv770_resume_smc(rdev);
+       if (ret) {
+               DRM_ERROR("rv770_resume_smc failed\n");
+               return ret;
+       }
+       ret = rv770_set_sw_state(rdev);
+       if (ret) {
+               DRM_ERROR("rv770_set_sw_state failed\n");
+               return ret;
+       }
+       ni_set_uvd_clock_after_set_eng_clock(rdev, new_ps, old_ps);
+       ret = ni_enable_smc_cac(rdev, new_ps, true);
+       if (ret) {
+               DRM_ERROR("ni_enable_smc_cac failed\n");
+               return ret;
+       }
+       ret = ni_enable_power_containment(rdev, new_ps, true);
+       if (ret) {
+               DRM_ERROR("ni_enable_power_containment failed\n");
                return ret;
-       ni_populate_smc_tdp_limits(rdev, new_ps);
-       rv770_resume_smc(rdev);
-       rv770_set_sw_state(rdev);
-       ni_enable_smc_cac(rdev, new_ps, true);
-       ni_enable_power_containment(rdev, new_ps, true);
+       }
 
-#if 0
-       /* XXX */
-       ni_unrestrict_performance_levels_after_switch(rdev);
-#endif
+       /* update tdp */
+       ret = ni_power_control_set_level(rdev);
+       if (ret) {
+               DRM_ERROR("ni_power_control_set_level failed\n");
+               return ret;
+       }
+
+       ret = ni_unrestrict_performance_levels_after_switch(rdev);
+       if (ret) {
+               DRM_ERROR("ni_unrestrict_performance_levels_after_switch failed\n");
+               return ret;
+       }
 
        return 0;
 }
 
+void ni_dpm_post_set_power_state(struct radeon_device *rdev)
+{
+       struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);
+       struct radeon_ps *new_ps = &eg_pi->requested_rps;
+
+       ni_update_current_ps(rdev, new_ps);
+}
+
 void ni_dpm_reset_asic(struct radeon_device *rdev)
 {
        ni_restrict_performance_levels_before_switch(rdev);
@@ -3778,8 +3949,8 @@ static void ni_parse_pplib_clock_info(struct radeon_device *rdev,
 
        /* patch up boot state */
        if (rps->class & ATOM_PPLIB_CLASSIFICATION_BOOT) {
-               u16 vddc, vddci;
-               radeon_atombios_get_default_voltages(rdev, &vddc, &vddci);
+               u16 vddc, vddci, mvdd;
+               radeon_atombios_get_default_voltages(rdev, &vddc, &vddci, &mvdd);
                pl->mclk = rdev->clock.default_mclk;
                pl->sclk = rdev->clock.default_sclk;
                pl->vddc = vddc;
@@ -3890,6 +4061,22 @@ int ni_dpm_init(struct radeon_device *rdev)
        if (ret)
                return ret;
 
+       rdev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries =
+               kzalloc(4 * sizeof(struct radeon_clock_voltage_dependency_entry), GFP_KERNEL);
+       if (!rdev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries) {
+               r600_free_extended_power_table(rdev);
+               return -ENOMEM;
+       }
+       rdev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.count = 4;
+       rdev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[0].clk = 0;
+       rdev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[0].v = 0;
+       rdev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[1].clk = 36000;
+       rdev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[1].v = 720;
+       rdev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[2].clk = 54000;
+       rdev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[2].v = 810;
+       rdev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[3].clk = 72000;
+       rdev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[3].v = 900;
+
        ni_patch_dependency_tables_based_on_leakage(rdev);
 
        if (rdev->pm.dpm.voltage_response_time == 0)
@@ -3933,13 +4120,13 @@ int ni_dpm_init(struct radeon_device *rdev)
        ni_pi->mclk_rtt_mode_threshold = eg_pi->mclk_edc_wr_enable_threshold;
 
        pi->voltage_control =
-               radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC);
+               radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC, 0);
 
        pi->mvdd_control =
-               radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_MVDDC);
+               radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_MVDDC, 0);
 
        eg_pi->vddci_control =
-               radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDCI);
+               radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDCI, 0);
 
        if (atom_parse_data_header(rdev->mode_info.atom_context, index, &size,
                                    &frev, &crev, &data_offset)) {
@@ -4074,6 +4261,7 @@ void ni_dpm_fini(struct radeon_device *rdev)
        }
        kfree(rdev->pm.dpm.ps);
        kfree(rdev->pm.dpm.priv);
+       kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries);
        r600_free_extended_power_table(rdev);
 }
 
@@ -4089,15 +4277,20 @@ void ni_dpm_print_power_state(struct radeon_device *rdev,
        printk("\tuvd    vclk: %d dclk: %d\n", rps->vclk, rps->dclk);
        for (i = 0; i < ps->performance_level_count; i++) {
                pl = &ps->performance_levels[i];
-               printk("\t\tpower level 0    sclk: %u mclk: %u vddc: %u vddci: %u\n",
-                      pl->sclk, pl->mclk, pl->vddc, pl->vddci);
+               if (rdev->family >= CHIP_TAHITI)
+                       printk("\t\tpower level %d    sclk: %u mclk: %u vddc: %u vddci: %u pcie gen: %u\n",
+                              i, pl->sclk, pl->mclk, pl->vddc, pl->vddci, pl->pcie_gen + 1);
+               else
+                       printk("\t\tpower level %d    sclk: %u mclk: %u vddc: %u vddci: %u\n",
+                              i, pl->sclk, pl->mclk, pl->vddc, pl->vddci);
        }
        r600_dpm_print_ps_status(rdev, rps);
 }
 
 u32 ni_dpm_get_sclk(struct radeon_device *rdev, bool low)
 {
-       struct ni_ps *requested_state = ni_get_ps(rdev->pm.dpm.requested_ps);
+       struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);
+       struct ni_ps *requested_state = ni_get_ps(&eg_pi->requested_rps);
 
        if (low)
                return requested_state->performance_levels[0].sclk;
@@ -4107,7 +4300,8 @@ u32 ni_dpm_get_sclk(struct radeon_device *rdev, bool low)
 
 u32 ni_dpm_get_mclk(struct radeon_device *rdev, bool low)
 {
-       struct ni_ps *requested_state = ni_get_ps(rdev->pm.dpm.requested_ps);
+       struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);
+       struct ni_ps *requested_state = ni_get_ps(&eg_pi->requested_rps);
 
        if (low)
                return requested_state->performance_levels[0].mclk;