From: Alex Deucher <alexander.deuc...@amd.com>

This adds dpm support for rv7xx asics.  This includes:
- clockgating
- dynamic engine clock scaling
- dynamic memory clock scaling
- dynamic voltage scaling
- dynamic pcie gen1/gen2 switching

Set radeon.dpm=1 to enable.

v2: reduce stack usage

Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
---
 drivers/gpu/drm/radeon/Makefile       |    3 +-
 drivers/gpu/drm/radeon/ppsmc.h        |   76 ++
 drivers/gpu/drm/radeon/r600.c         |   48 +-
 drivers/gpu/drm/radeon/r600d.h        |    2 +
 drivers/gpu/drm/radeon/radeon.h       |    1 +
 drivers/gpu/drm/radeon/radeon_asic.c  |   12 +
 drivers/gpu/drm/radeon/radeon_asic.h  |   12 +
 drivers/gpu/drm/radeon/radeon_pm.c    |    4 +
 drivers/gpu/drm/radeon/radeon_ucode.h |   21 +
 drivers/gpu/drm/radeon/rv730_dpm.c    |  508 +++++++
 drivers/gpu/drm/radeon/rv730d.h       |  165 +++
 drivers/gpu/drm/radeon/rv740_dpm.c    |  417 ++++++
 drivers/gpu/drm/radeon/rv740d.h       |  117 ++
 drivers/gpu/drm/radeon/rv770_dpm.c    | 2325 +++++++++++++++++++++++++++++++++
 drivers/gpu/drm/radeon/rv770_dpm.h    |  272 ++++
 drivers/gpu/drm/radeon/rv770_smc.c    |  404 ++++++
 drivers/gpu/drm/radeon/rv770_smc.h    |  208 +++
 drivers/gpu/drm/radeon/rv770d.h       |  279 ++++-
 18 files changed, 4861 insertions(+), 13 deletions(-)
 create mode 100644 drivers/gpu/drm/radeon/ppsmc.h
 create mode 100644 drivers/gpu/drm/radeon/rv730_dpm.c
 create mode 100644 drivers/gpu/drm/radeon/rv730d.h
 create mode 100644 drivers/gpu/drm/radeon/rv740_dpm.c
 create mode 100644 drivers/gpu/drm/radeon/rv740d.h
 create mode 100644 drivers/gpu/drm/radeon/rv770_dpm.c
 create mode 100644 drivers/gpu/drm/radeon/rv770_dpm.h
 create mode 100644 drivers/gpu/drm/radeon/rv770_smc.c
 create mode 100644 drivers/gpu/drm/radeon/rv770_smc.h

diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
index 3aa20dc..c97753d 100644
--- a/drivers/gpu/drm/radeon/Makefile
+++ b/drivers/gpu/drm/radeon/Makefile
@@ -77,7 +77,8 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \
        evergreen_hdmi.o radeon_trace_points.o ni.o cayman_blit_shaders.o \
        atombios_encoders.o radeon_semaphore.o radeon_sa.o atombios_i2c.o si.o \
        si_blit_shaders.o radeon_prime.o radeon_uvd.o cik.o cik_blit_shaders.o \
-       r600_dpm.o rs780_dpm.o rv6xx_dpm.o
+       r600_dpm.o rs780_dpm.o rv6xx_dpm.o rv770_dpm.o rv730_dpm.o rv740_dpm.o \
+       rv770_smc.o

 radeon-$(CONFIG_COMPAT) += radeon_ioc32.o
 radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o
diff --git a/drivers/gpu/drm/radeon/ppsmc.h b/drivers/gpu/drm/radeon/ppsmc.h
new file mode 100644
index 0000000..638de17
--- /dev/null
+++ b/drivers/gpu/drm/radeon/ppsmc.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2011 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+#ifndef PP_SMC_H
+#define PP_SMC_H
+
+#pragma pack(push, 1)
+
+#define PPSMC_SWSTATE_FLAG_DC                           0x01
+
+#define PPSMC_THERMAL_PROTECT_TYPE_INTERNAL             0x00
+#define PPSMC_THERMAL_PROTECT_TYPE_EXTERNAL             0x01
+#define PPSMC_THERMAL_PROTECT_TYPE_NONE                 0xff
+
+#define PPSMC_SYSTEMFLAG_GPIO_DC                        0x01
+#define PPSMC_SYSTEMFLAG_STEPVDDC                       0x02
+#define PPSMC_SYSTEMFLAG_GDDR5                          0x04
+#define PPSMC_SYSTEMFLAG_DISABLE_BABYSTEP               0x08
+#define PPSMC_SYSTEMFLAG_REGULATOR_HOT                  0x10
+
+#define PPSMC_EXTRAFLAGS_AC2DC_ACTION_MASK              0x07
+#define PPSMC_EXTRAFLAGS_AC2DC_DONT_WAIT_FOR_VBLANK     0x08
+#define PPSMC_EXTRAFLAGS_AC2DC_ACTION_GOTODPMLOWSTATE   0x00
+#define PPSMC_EXTRAFLAGS_AC2DC_ACTION_GOTOINITIALSTATE  0x01
+
+#define PPSMC_DISPLAY_WATERMARK_LOW                     0
+#define PPSMC_DISPLAY_WATERMARK_HIGH                    1
+
+#define PPSMC_STATEFLAG_AUTO_PULSE_SKIP    0x01
+
+#define PPSMC_Result_OK             ((uint8_t)0x01)
+#define PPSMC_Result_Failed         ((uint8_t)0xFF)
+
+typedef uint8_t PPSMC_Result;
+
+#define PPSMC_MSG_Halt                      ((uint8_t)0x10)
+#define PPSMC_MSG_Resume                    ((uint8_t)0x11)
+#define PPSMC_MSG_TwoLevelsDisabled         ((uint8_t)0x15)
+#define PPSMC_MSG_EnableThermalInterrupt    ((uint8_t)0x16)
+#define PPSMC_MSG_SwitchToSwState           ((uint8_t)0x20)
+#define PPSMC_MSG_SwitchToInitialState      ((uint8_t)0x40)
+#define PPSMC_MSG_NoForcedLevel             ((uint8_t)0x41)
+#define PPSMC_MSG_SwitchToMinimumPower      ((uint8_t)0x51)
+#define PPSMC_MSG_ResumeFromMinimumPower    ((uint8_t)0x52)
+#define PPSMC_MSG_NoDisplay                 ((uint8_t)0x5D)
+#define PPSMC_MSG_HasDisplay                ((uint8_t)0x5E)
+#define PPSMC_MSG_EnableULV                 ((uint8_t)0x62)
+#define PPSMC_MSG_DisableULV                ((uint8_t)0x63)
+#define PPSMC_MSG_EnterULV                  ((uint8_t)0x64)
+#define PPSMC_MSG_ExitULV                   ((uint8_t)0x65)
+#define PPSMC_MSG_ResetToDefaults           ((uint8_t)0x84)
+
+typedef uint8_t PPSMC_Msg;
+
+#pragma pack(pop)
+
+#endif
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 7ea81c8..0688016 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -57,10 +57,14 @@ MODULE_FIRMWARE("radeon/RS780_pfp.bin");
 MODULE_FIRMWARE("radeon/RS780_me.bin");
 MODULE_FIRMWARE("radeon/RV770_pfp.bin");
 MODULE_FIRMWARE("radeon/RV770_me.bin");
+MODULE_FIRMWARE("radeon/RV770_smc.bin");
 MODULE_FIRMWARE("radeon/RV730_pfp.bin");
 MODULE_FIRMWARE("radeon/RV730_me.bin");
+MODULE_FIRMWARE("radeon/RV730_smc.bin");
+MODULE_FIRMWARE("radeon/RV740_smc.bin");
 MODULE_FIRMWARE("radeon/RV710_pfp.bin");
 MODULE_FIRMWARE("radeon/RV710_me.bin");
+MODULE_FIRMWARE("radeon/RV710_smc.bin");
 MODULE_FIRMWARE("radeon/R600_rlc.bin");
 MODULE_FIRMWARE("radeon/R700_rlc.bin");
 MODULE_FIRMWARE("radeon/CEDAR_pfp.bin");
@@ -2139,7 +2143,8 @@ int r600_init_microcode(struct radeon_device *rdev)
        struct platform_device *pdev;
        const char *chip_name;
        const char *rlc_chip_name;
-       size_t pfp_req_size, me_req_size, rlc_req_size;
+       const char *smc_chip_name = "RV770";
+       size_t pfp_req_size, me_req_size, rlc_req_size, smc_req_size = 0;
        char fw_name[30];
        int err;

@@ -2185,15 +2190,26 @@ int r600_init_microcode(struct radeon_device *rdev)
        case CHIP_RV770:
                chip_name = "RV770";
                rlc_chip_name = "R700";
+               smc_chip_name = "RV770";
+               smc_req_size = ALIGN(RV770_SMC_UCODE_SIZE, 4);
                break;
        case CHIP_RV730:
-       case CHIP_RV740:
                chip_name = "RV730";
                rlc_chip_name = "R700";
+               smc_chip_name = "RV730";
+               smc_req_size = ALIGN(RV730_SMC_UCODE_SIZE, 4);
                break;
        case CHIP_RV710:
                chip_name = "RV710";
                rlc_chip_name = "R700";
+               smc_chip_name = "RV710";
+               smc_req_size = ALIGN(RV710_SMC_UCODE_SIZE, 4);
+               break;
+       case CHIP_RV740:
+               chip_name = "RV730";
+               rlc_chip_name = "R700";
+               smc_chip_name = "RV740";
+               smc_req_size = ALIGN(RV740_SMC_UCODE_SIZE, 4);
                break;
        case CHIP_CEDAR:
                chip_name = "CEDAR";
@@ -2277,6 +2293,19 @@ int r600_init_microcode(struct radeon_device *rdev)
                err = -EINVAL;
        }

+       if ((rdev->family >= CHIP_RV770) && (rdev->family <= CHIP_RV740)) {
+               snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", 
smc_chip_name);
+               err = request_firmware(&rdev->smc_fw, fw_name, &pdev->dev);
+               if (err)
+                       goto out;
+               if (rdev->smc_fw->size != smc_req_size) {
+                       printk(KERN_ERR
+                              "smc: Bogus length %zu in firmware \"%s\"\n",
+                              rdev->smc_fw->size, fw_name);
+                       err = -EINVAL;
+               }
+       }
+
 out:
        platform_device_unregister(pdev);

@@ -2291,6 +2320,8 @@ out:
                rdev->me_fw = NULL;
                release_firmware(rdev->rlc_fw);
                rdev->rlc_fw = NULL;
+               release_firmware(rdev->smc_fw);
+               rdev->smc_fw = NULL;
        }
        return err;
 }
@@ -4039,10 +4070,13 @@ int r600_irq_set(struct radeon_device *rdev)
        if ((rdev->family > CHIP_R600) && (rdev->family < CHIP_RV770)) {
                thermal_int = RREG32(CG_THERMAL_INT) &
                        ~(THERM_INT_MASK_HIGH | THERM_INT_MASK_LOW);
-               if (rdev->irq.dpm_thermal) {
-                       DRM_DEBUG("dpm thermal\n");
-                       thermal_int |= THERM_INT_MASK_HIGH | THERM_INT_MASK_LOW;
-               }
+       } else if (rdev->family >= CHIP_RV770) {
+               thermal_int = RREG32(RV770_CG_THERMAL_INT) &
+                       ~(THERM_INT_MASK_HIGH | THERM_INT_MASK_LOW);
+       }
+       if (rdev->irq.dpm_thermal) {
+               DRM_DEBUG("dpm thermal\n");
+               thermal_int |= THERM_INT_MASK_HIGH | THERM_INT_MASK_LOW;
        }

        if (atomic_read(&rdev->irq.ring_int[RADEON_RING_TYPE_GFX_INDEX])) {
@@ -4128,6 +4162,8 @@ int r600_irq_set(struct radeon_device *rdev)
        }
        if ((rdev->family > CHIP_R600) && (rdev->family < CHIP_RV770)) {
                WREG32(CG_THERMAL_INT, thermal_int);
+       } else if (rdev->family >= CHIP_RV770) {
+               WREG32(RV770_CG_THERMAL_INT, thermal_int);
        }

        return 0;
diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h
index 3bca4db..f1b3084 100644
--- a/drivers/gpu/drm/radeon/r600d.h
+++ b/drivers/gpu/drm/radeon/r600d.h
@@ -320,6 +320,8 @@
 #define        THERM_INT_MASK_HIGH                     (1 << 24)
 #define        THERM_INT_MASK_LOW                      (1 << 25)

+#define        RV770_CG_THERMAL_INT                            0x734
+
 #define        HDP_HOST_PATH_CNTL                              0x2C00
 #define        HDP_NONSURFACE_BASE                             0x2C04
 #define        HDP_NONSURFACE_INFO                             0x2C08
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index ce36130..3e94920 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1914,6 +1914,7 @@ struct radeon_device {
        const struct firmware *uvd_fw;  /* UVD firmware */
        const struct firmware *mec_fw;  /* CIK MEC firmware */
        const struct firmware *sdma_fw; /* CIK SDMA firmware */
+       const struct firmware *smc_fw;  /* SMC firmware */
        struct r600_blit r600_blit;
        struct r600_vram_scratch vram_scratch;
        int msi_enabled; /* msi enabled */
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c 
b/drivers/gpu/drm/radeon/radeon_asic.c
index 4705b02..dbbcf33 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -1317,6 +1317,18 @@ static struct radeon_asic rv770_asic = {
                .set_uvd_clocks = &rv770_set_uvd_clocks,
                .get_temperature = &rv770_get_temp,
        },
+       .dpm = {
+               .init = &rv770_dpm_init,
+               .setup_asic = &rv770_dpm_setup_asic,
+               .enable = &rv770_dpm_enable,
+               .disable = &rv770_dpm_disable,
+               .set_power_state = &rv770_dpm_set_power_state,
+               .display_configuration_changed = 
&rv770_dpm_display_configuration_changed,
+               .fini = &rv770_dpm_fini,
+               .get_sclk = &rv770_dpm_get_sclk,
+               .get_mclk = &rv770_dpm_get_mclk,
+               .print_power_state = &rv770_dpm_print_power_state,
+       },
        .pflip = {
                .pre_page_flip = &rs600_pre_page_flip,
                .page_flip = &rv770_page_flip,
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h 
b/drivers/gpu/drm/radeon/radeon_asic.h
index 878766624..f7041a7 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -454,6 +454,18 @@ u32 rv770_get_xclk(struct radeon_device *rdev);
 int rv770_uvd_resume(struct radeon_device *rdev);
 int rv770_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk);
 int rv770_get_temp(struct radeon_device *rdev);
+/* rv7xx pm */
+int rv770_dpm_init(struct radeon_device *rdev);
+int rv770_dpm_enable(struct radeon_device *rdev);
+void rv770_dpm_disable(struct radeon_device *rdev);
+int rv770_dpm_set_power_state(struct radeon_device *rdev);
+void rv770_dpm_setup_asic(struct radeon_device *rdev);
+void rv770_dpm_display_configuration_changed(struct radeon_device *rdev);
+void rv770_dpm_fini(struct radeon_device *rdev);
+u32 rv770_dpm_get_sclk(struct radeon_device *rdev, bool low);
+u32 rv770_dpm_get_mclk(struct radeon_device *rdev, bool low);
+void rv770_dpm_print_power_state(struct radeon_device *rdev,
+                                struct radeon_ps *ps);

 /*
  * evergreen
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c 
b/drivers/gpu/drm/radeon/radeon_pm.c
index 5cb01f2..595607c 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -1040,6 +1040,10 @@ int radeon_pm_init(struct radeon_device *rdev)
        case CHIP_RV670:
        case CHIP_RS780:
        case CHIP_RS880:
+       case CHIP_RV770:
+       case CHIP_RV730:
+       case CHIP_RV710:
+       case CHIP_RV740:
                if (radeon_dpm == 1)
                        rdev->pm.pm_method = PM_METHOD_DPM;
                else
diff --git a/drivers/gpu/drm/radeon/radeon_ucode.h 
b/drivers/gpu/drm/radeon/radeon_ucode.h
index d2642b0..1910545 100644
--- a/drivers/gpu/drm/radeon/radeon_ucode.h
+++ b/drivers/gpu/drm/radeon/radeon_ucode.h
@@ -44,4 +44,25 @@
 #define BTC_MC_UCODE_SIZE            6024
 #define CAYMAN_MC_UCODE_SIZE         6037

+/* SMC */
+#define RV770_SMC_UCODE_START        0x0100
+#define RV770_SMC_UCODE_SIZE         0x410d
+#define RV770_SMC_INT_VECTOR_START   0xffc0
+#define RV770_SMC_INT_VECTOR_SIZE    0x0040
+
+#define RV730_SMC_UCODE_START        0x0100
+#define RV730_SMC_UCODE_SIZE         0x412c
+#define RV730_SMC_INT_VECTOR_START   0xffc0
+#define RV730_SMC_INT_VECTOR_SIZE    0x0040
+
+#define RV710_SMC_UCODE_START        0x0100
+#define RV710_SMC_UCODE_SIZE         0x3f1f
+#define RV710_SMC_INT_VECTOR_START   0xffc0
+#define RV710_SMC_INT_VECTOR_SIZE    0x0040
+
+#define RV740_SMC_UCODE_START        0x0100
+#define RV740_SMC_UCODE_SIZE         0x41c5
+#define RV740_SMC_INT_VECTOR_START   0xffc0
+#define RV740_SMC_INT_VECTOR_SIZE    0x0040
+
 #endif
diff --git a/drivers/gpu/drm/radeon/rv730_dpm.c 
b/drivers/gpu/drm/radeon/rv730_dpm.c
new file mode 100644
index 0000000..b23be71
--- /dev/null
+++ b/drivers/gpu/drm/radeon/rv730_dpm.c
@@ -0,0 +1,508 @@
+/*
+ * Copyright 2011 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Alex Deucher
+ */
+
+#include "drmP.h"
+#include "radeon.h"
+#include "rv730d.h"
+#include "r600_dpm.h"
+#include "rv770_dpm.h"
+#include "atom.h"
+
+#define MC_CG_ARB_FREQ_F0           0x0a
+#define MC_CG_ARB_FREQ_F1           0x0b
+#define MC_CG_ARB_FREQ_F2           0x0c
+#define MC_CG_ARB_FREQ_F3           0x0d
+
+struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps);
+struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev);
+
+int rv730_populate_sclk_value(struct radeon_device *rdev,
+                             u32 engine_clock,
+                             RV770_SMC_SCLK_VALUE *sclk)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       struct atom_clock_dividers dividers;
+       u32 spll_func_cntl = pi->clk_regs.rv730.cg_spll_func_cntl;
+       u32 spll_func_cntl_2 = pi->clk_regs.rv730.cg_spll_func_cntl_2;
+       u32 spll_func_cntl_3 = pi->clk_regs.rv730.cg_spll_func_cntl_3;
+       u32 cg_spll_spread_spectrum = 
pi->clk_regs.rv730.cg_spll_spread_spectrum;
+       u32 cg_spll_spread_spectrum_2 = 
pi->clk_regs.rv730.cg_spll_spread_spectrum_2;
+       u64 tmp;
+       u32 reference_clock = rdev->clock.spll.reference_freq;
+       u32 reference_divider, post_divider;
+       u32 fbdiv;
+       int ret;
+
+       ret = radeon_atom_get_clock_dividers(rdev, COMPUTE_ENGINE_PLL_PARAM,
+                                            engine_clock, false, &dividers);
+       if (ret)
+               return ret;
+
+       reference_divider = 1 + dividers.ref_div;
+
+       if (dividers.enable_post_div)
+               post_divider = ((dividers.post_div >> 4) & 0xf) +
+                       (dividers.post_div & 0xf) + 2;
+       else
+               post_divider = 1;
+
+       tmp = (u64) engine_clock * reference_divider * post_divider;
+
+       fbdiv = (u32) ((16384 * tmp) / reference_clock);
+
+       /* set up registers */
+       if (dividers.enable_post_div)
+               spll_func_cntl |= SPLL_DIVEN;
+       else
+               spll_func_cntl &= ~SPLL_DIVEN;
+       spll_func_cntl &= ~(SPLL_HILEN_MASK | SPLL_LOLEN_MASK | 
SPLL_REF_DIV_MASK);
+       spll_func_cntl |= SPLL_REF_DIV(dividers.ref_div);
+       spll_func_cntl |= SPLL_HILEN((dividers.post_div >> 4) & 0xf);
+       spll_func_cntl |= SPLL_LOLEN(dividers.post_div & 0xf);
+
+       spll_func_cntl_2 &= ~SCLK_MUX_SEL_MASK;
+       spll_func_cntl_2 |= SCLK_MUX_SEL(2);
+
+       spll_func_cntl_3 &= ~SPLL_FB_DIV_MASK;
+       spll_func_cntl_3 |= SPLL_FB_DIV(fbdiv);
+       spll_func_cntl_3 |= SPLL_DITHEN;
+
+       if (pi->sclk_ss) {
+               struct radeon_atom_ss ss;
+               u32 vco_freq = engine_clock * post_divider;
+
+               if (radeon_atombios_get_asic_ss_info(rdev, &ss,
+                                                    ASIC_INTERNAL_ENGINE_SS, 
vco_freq)) {
+                       u32 clk_s = reference_clock * 5 / (reference_divider * 
ss.rate);
+                       u32 clk_v = ss.percentage * fbdiv / (clk_s * 10000);
+
+                       cg_spll_spread_spectrum &= ~CLK_S_MASK;
+                       cg_spll_spread_spectrum |= CLK_S(clk_s);
+                       cg_spll_spread_spectrum |= SSEN;
+
+                       cg_spll_spread_spectrum_2 &= ~CLK_V_MASK;
+                       cg_spll_spread_spectrum_2 |= CLK_V(clk_v);
+               }
+       }
+
+       sclk->sclk_value = cpu_to_be32(engine_clock);
+       sclk->vCG_SPLL_FUNC_CNTL = cpu_to_be32(spll_func_cntl);
+       sclk->vCG_SPLL_FUNC_CNTL_2 = cpu_to_be32(spll_func_cntl_2);
+       sclk->vCG_SPLL_FUNC_CNTL_3 = cpu_to_be32(spll_func_cntl_3);
+       sclk->vCG_SPLL_SPREAD_SPECTRUM = cpu_to_be32(cg_spll_spread_spectrum);
+       sclk->vCG_SPLL_SPREAD_SPECTRUM_2 = 
cpu_to_be32(cg_spll_spread_spectrum_2);
+
+       return 0;
+}
+
+int rv730_populate_mclk_value(struct radeon_device *rdev,
+                             u32 engine_clock, u32 memory_clock,
+                             LPRV7XX_SMC_MCLK_VALUE mclk)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u32 mclk_pwrmgt_cntl = pi->clk_regs.rv730.mclk_pwrmgt_cntl;
+       u32 dll_cntl = pi->clk_regs.rv730.dll_cntl;
+       u32 mpll_func_cntl = pi->clk_regs.rv730.mpll_func_cntl;
+       u32 mpll_func_cntl_2 = pi->clk_regs.rv730.mpll_func_cntl2;
+       u32 mpll_func_cntl_3 = pi->clk_regs.rv730.mpll_func_cntl3;
+       u32 mpll_ss = pi->clk_regs.rv730.mpll_ss;
+       u32 mpll_ss2 = pi->clk_regs.rv730.mpll_ss2;
+       struct atom_clock_dividers dividers;
+       u32 post_divider, reference_divider;
+       int ret;
+
+       ret = radeon_atom_get_clock_dividers(rdev, COMPUTE_MEMORY_PLL_PARAM,
+                                            memory_clock, false, &dividers);
+       if (ret)
+               return ret;
+
+       reference_divider = dividers.ref_div + 1;
+
+       if (dividers.enable_post_div)
+               post_divider = ((dividers.post_div >> 4) & 0xf) +
+                       (dividers.post_div & 0xf) + 2;
+       else
+               post_divider = 1;
+
+       /* setup the registers */
+       if (dividers.enable_post_div)
+               mpll_func_cntl |= MPLL_DIVEN;
+       else
+               mpll_func_cntl &= ~MPLL_DIVEN;
+
+       mpll_func_cntl &= ~(MPLL_REF_DIV_MASK | MPLL_HILEN_MASK | 
MPLL_LOLEN_MASK);
+       mpll_func_cntl |= MPLL_REF_DIV(dividers.ref_div);
+       mpll_func_cntl |= MPLL_HILEN((dividers.post_div >> 4) & 0xf);
+       mpll_func_cntl |= MPLL_LOLEN(dividers.post_div & 0xf);
+
+       mpll_func_cntl_3 &= ~MPLL_FB_DIV_MASK;
+       mpll_func_cntl_3 |= MPLL_FB_DIV(dividers.fb_div);
+       if (dividers.enable_dithen)
+               mpll_func_cntl_3 |= MPLL_DITHEN;
+       else
+               mpll_func_cntl_3 &= ~MPLL_DITHEN;
+
+       if (pi->mclk_ss) {
+               struct radeon_atom_ss ss;
+               u32 vco_freq = memory_clock * post_divider;
+
+               if (radeon_atombios_get_asic_ss_info(rdev, &ss,
+                                                    ASIC_INTERNAL_MEMORY_SS, 
vco_freq)) {
+                       u32 reference_clock = rdev->clock.mpll.reference_freq;
+                       u32 clk_s = reference_clock * 5 / (reference_divider * 
ss.rate);
+                       u32 clk_v = ss.percentage * dividers.fb_div / (clk_s * 
10000);
+
+                       mpll_ss &= ~CLK_S_MASK;
+                       mpll_ss |= CLK_S(clk_s);
+                       mpll_ss |= SSEN;
+
+                       mpll_ss2 &= ~CLK_V_MASK;
+                       mpll_ss |= CLK_V(clk_v);
+               }
+       }
+
+
+       mclk->mclk730.vMCLK_PWRMGT_CNTL = cpu_to_be32(mclk_pwrmgt_cntl);
+       mclk->mclk730.vDLL_CNTL = cpu_to_be32(dll_cntl);
+       mclk->mclk730.mclk_value = cpu_to_be32(memory_clock);
+       mclk->mclk730.vMPLL_FUNC_CNTL = cpu_to_be32(mpll_func_cntl);
+       mclk->mclk730.vMPLL_FUNC_CNTL2 = cpu_to_be32(mpll_func_cntl_2);
+       mclk->mclk730.vMPLL_FUNC_CNTL3 = cpu_to_be32(mpll_func_cntl_3);
+       mclk->mclk730.vMPLL_SS = cpu_to_be32(mpll_ss);
+       mclk->mclk730.vMPLL_SS2 = cpu_to_be32(mpll_ss2);
+
+       return 0;
+}
+
+void rv730_read_clock_registers(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       pi->clk_regs.rv730.cg_spll_func_cntl =
+               RREG32(CG_SPLL_FUNC_CNTL);
+       pi->clk_regs.rv730.cg_spll_func_cntl_2 =
+               RREG32(CG_SPLL_FUNC_CNTL_2);
+       pi->clk_regs.rv730.cg_spll_func_cntl_3 =
+               RREG32(CG_SPLL_FUNC_CNTL_3);
+       pi->clk_regs.rv730.cg_spll_spread_spectrum =
+               RREG32(CG_SPLL_SPREAD_SPECTRUM);
+       pi->clk_regs.rv730.cg_spll_spread_spectrum_2 =
+               RREG32(CG_SPLL_SPREAD_SPECTRUM_2);
+
+       pi->clk_regs.rv730.mclk_pwrmgt_cntl =
+               RREG32(TCI_MCLK_PWRMGT_CNTL);
+       pi->clk_regs.rv730.dll_cntl =
+               RREG32(TCI_DLL_CNTL);
+       pi->clk_regs.rv730.mpll_func_cntl =
+               RREG32(CG_MPLL_FUNC_CNTL);
+       pi->clk_regs.rv730.mpll_func_cntl2 =
+               RREG32(CG_MPLL_FUNC_CNTL_2);
+       pi->clk_regs.rv730.mpll_func_cntl3 =
+               RREG32(CG_MPLL_FUNC_CNTL_3);
+       pi->clk_regs.rv730.mpll_ss =
+               RREG32(CG_TCI_MPLL_SPREAD_SPECTRUM);
+       pi->clk_regs.rv730.mpll_ss2 =
+               RREG32(CG_TCI_MPLL_SPREAD_SPECTRUM_2);
+}
+
+int rv730_populate_smc_acpi_state(struct radeon_device *rdev,
+                                 RV770_SMC_STATETABLE *table)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u32 mpll_func_cntl = 0;
+       u32 mpll_func_cntl_2 = 0 ;
+       u32 mpll_func_cntl_3 = 0;
+       u32 mclk_pwrmgt_cntl;
+       u32 dll_cntl;
+       u32 spll_func_cntl;
+       u32 spll_func_cntl_2;
+       u32 spll_func_cntl_3;
+
+       table->ACPIState = table->initialState;
+       table->ACPIState.flags &= ~PPSMC_SWSTATE_FLAG_DC;
+
+       if (pi->acpi_vddc) {
+               rv770_populate_vddc_value(rdev, pi->acpi_vddc,
+                                         &table->ACPIState.levels[0].vddc);
+               table->ACPIState.levels[0].gen2PCIE = pi->pcie_gen2 ?
+                       pi->acpi_pcie_gen2 : 0;
+               table->ACPIState.levels[0].gen2XSP =
+                       pi->acpi_pcie_gen2;
+       } else {
+               rv770_populate_vddc_value(rdev, pi->min_vddc_in_table,
+                                         &table->ACPIState.levels[0].vddc);
+               table->ACPIState.levels[0].gen2PCIE = 0;
+       }
+
+       mpll_func_cntl = pi->clk_regs.rv730.mpll_func_cntl;
+       mpll_func_cntl_2 = pi->clk_regs.rv730.mpll_func_cntl2;
+       mpll_func_cntl_3 = pi->clk_regs.rv730.mpll_func_cntl3;
+
+       mpll_func_cntl |= MPLL_RESET | MPLL_BYPASS_EN;
+       mpll_func_cntl &= ~MPLL_SLEEP;
+
+       mpll_func_cntl_2 &= ~MCLK_MUX_SEL_MASK;
+       mpll_func_cntl_2 |= MCLK_MUX_SEL(1);
+
+       mclk_pwrmgt_cntl = (MRDCKA_RESET |
+                           MRDCKB_RESET |
+                           MRDCKC_RESET |
+                           MRDCKD_RESET |
+                           MRDCKE_RESET |
+                           MRDCKF_RESET |
+                           MRDCKG_RESET |
+                           MRDCKH_RESET |
+                           MRDCKA_SLEEP |
+                           MRDCKB_SLEEP |
+                           MRDCKC_SLEEP |
+                           MRDCKD_SLEEP |
+                           MRDCKE_SLEEP |
+                           MRDCKF_SLEEP |
+                           MRDCKG_SLEEP |
+                           MRDCKH_SLEEP);
+
+       dll_cntl = 0xff000000;
+
+       spll_func_cntl = pi->clk_regs.rv730.cg_spll_func_cntl;
+       spll_func_cntl_2 = pi->clk_regs.rv730.cg_spll_func_cntl_2;
+       spll_func_cntl_3 = pi->clk_regs.rv730.cg_spll_func_cntl_3;
+
+       spll_func_cntl |= SPLL_RESET | SPLL_BYPASS_EN;
+       spll_func_cntl &= ~SPLL_SLEEP;
+
+       spll_func_cntl_2 &= ~SCLK_MUX_SEL_MASK;
+       spll_func_cntl_2 |= SCLK_MUX_SEL(4);
+
+       table->ACPIState.levels[0].mclk.mclk730.vMPLL_FUNC_CNTL = 
cpu_to_be32(mpll_func_cntl);
+       table->ACPIState.levels[0].mclk.mclk730.vMPLL_FUNC_CNTL2 = 
cpu_to_be32(mpll_func_cntl_2);
+       table->ACPIState.levels[0].mclk.mclk730.vMPLL_FUNC_CNTL3 = 
cpu_to_be32(mpll_func_cntl_3);
+       table->ACPIState.levels[0].mclk.mclk730.vMCLK_PWRMGT_CNTL = 
cpu_to_be32(mclk_pwrmgt_cntl);
+       table->ACPIState.levels[0].mclk.mclk730.vDLL_CNTL = 
cpu_to_be32(dll_cntl);
+
+       table->ACPIState.levels[0].mclk.mclk730.mclk_value = 0;
+
+       table->ACPIState.levels[0].sclk.vCG_SPLL_FUNC_CNTL = 
cpu_to_be32(spll_func_cntl);
+       table->ACPIState.levels[0].sclk.vCG_SPLL_FUNC_CNTL_2 = 
cpu_to_be32(spll_func_cntl_2);
+       table->ACPIState.levels[0].sclk.vCG_SPLL_FUNC_CNTL_3 = 
cpu_to_be32(spll_func_cntl_3);
+
+       table->ACPIState.levels[0].sclk.sclk_value = 0;
+
+       rv770_populate_mvdd_value(rdev, 0, &table->ACPIState.levels[0].mvdd);
+
+       table->ACPIState.levels[1] = table->ACPIState.levels[0];
+       table->ACPIState.levels[2] = table->ACPIState.levels[0];
+
+       return 0;
+}
+
+int rv730_populate_smc_initial_state(struct radeon_device *rdev,
+                                    struct radeon_ps *radeon_state,
+                                    RV770_SMC_STATETABLE *table)
+{
+       struct rv7xx_ps *initial_state = rv770_get_ps(radeon_state);
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u32 a_t;
+
+       table->initialState.levels[0].mclk.mclk730.vMPLL_FUNC_CNTL =
+               cpu_to_be32(pi->clk_regs.rv730.mpll_func_cntl);
+       table->initialState.levels[0].mclk.mclk730.vMPLL_FUNC_CNTL2 =
+               cpu_to_be32(pi->clk_regs.rv730.mpll_func_cntl2);
+       table->initialState.levels[0].mclk.mclk730.vMPLL_FUNC_CNTL3 =
+               cpu_to_be32(pi->clk_regs.rv730.mpll_func_cntl3);
+       table->initialState.levels[0].mclk.mclk730.vMCLK_PWRMGT_CNTL =
+               cpu_to_be32(pi->clk_regs.rv730.mclk_pwrmgt_cntl);
+       table->initialState.levels[0].mclk.mclk730.vDLL_CNTL =
+               cpu_to_be32(pi->clk_regs.rv730.dll_cntl);
+       table->initialState.levels[0].mclk.mclk730.vMPLL_SS =
+               cpu_to_be32(pi->clk_regs.rv730.mpll_ss);
+       table->initialState.levels[0].mclk.mclk730.vMPLL_SS2 =
+               cpu_to_be32(pi->clk_regs.rv730.mpll_ss2);
+
+       table->initialState.levels[0].mclk.mclk730.mclk_value =
+               cpu_to_be32(initial_state->low.mclk);
+
+       table->initialState.levels[0].sclk.vCG_SPLL_FUNC_CNTL =
+               cpu_to_be32(pi->clk_regs.rv730.cg_spll_func_cntl);
+       table->initialState.levels[0].sclk.vCG_SPLL_FUNC_CNTL_2 =
+               cpu_to_be32(pi->clk_regs.rv730.cg_spll_func_cntl_2);
+       table->initialState.levels[0].sclk.vCG_SPLL_FUNC_CNTL_3 =
+               cpu_to_be32(pi->clk_regs.rv730.cg_spll_func_cntl_3);
+       table->initialState.levels[0].sclk.vCG_SPLL_SPREAD_SPECTRUM =
+               cpu_to_be32(pi->clk_regs.rv730.cg_spll_spread_spectrum);
+       table->initialState.levels[0].sclk.vCG_SPLL_SPREAD_SPECTRUM_2 =
+               cpu_to_be32(pi->clk_regs.rv730.cg_spll_spread_spectrum_2);
+
+       table->initialState.levels[0].sclk.sclk_value =
+               cpu_to_be32(initial_state->low.sclk);
+
+       table->initialState.levels[0].arbValue = MC_CG_ARB_FREQ_F0;
+
+       table->initialState.levels[0].seqValue =
+               rv770_get_seq_value(rdev, &initial_state->low);
+
+       rv770_populate_vddc_value(rdev,
+                                 initial_state->low.vddc,
+                                 &table->initialState.levels[0].vddc);
+       rv770_populate_initial_mvdd_value(rdev,
+                                         &table->initialState.levels[0].mvdd);
+
+       a_t = CG_R(0xffff) | CG_L(0);
+
+       table->initialState.levels[0].aT = cpu_to_be32(a_t);
+
+       table->initialState.levels[0].bSP = cpu_to_be32(pi->dsp);
+
+       if (pi->boot_in_gen2)
+               table->initialState.levels[0].gen2PCIE = 1;
+       else
+               table->initialState.levels[0].gen2PCIE = 0;
+       if (initial_state->low.flags & ATOM_PPLIB_R600_FLAGS_PCIEGEN2)
+               table->initialState.levels[0].gen2XSP = 1;
+       else
+               table->initialState.levels[0].gen2XSP = 0;
+
+       table->initialState.levels[1] = table->initialState.levels[0];
+       table->initialState.levels[2] = table->initialState.levels[0];
+
+       table->initialState.flags |= PPSMC_SWSTATE_FLAG_DC;
+
+       return 0;
+}
+
+void rv730_program_memory_timing_parameters(struct radeon_device *rdev,
+                                           struct radeon_ps *radeon_state)
+{
+       struct rv7xx_ps *state = rv770_get_ps(radeon_state);
+       u32 arb_refresh_rate = 0;
+       u32 dram_timing = 0;
+       u32 dram_timing2 = 0;
+       u32 old_dram_timing = 0;
+       u32 old_dram_timing2 = 0;
+
+       arb_refresh_rate = RREG32(MC_ARB_RFSH_RATE) &
+               ~(POWERMODE1_MASK | POWERMODE2_MASK | POWERMODE3_MASK);
+       arb_refresh_rate |=
+               (POWERMODE1(rv770_calculate_memory_refresh_rate(rdev, 
state->low.sclk)) |
+                POWERMODE2(rv770_calculate_memory_refresh_rate(rdev, 
state->medium.sclk)) |
+                POWERMODE3(rv770_calculate_memory_refresh_rate(rdev, 
state->high.sclk)));
+       WREG32(MC_ARB_RFSH_RATE, arb_refresh_rate);
+
+       /* save the boot dram timings */
+       old_dram_timing = RREG32(MC_ARB_DRAM_TIMING);
+       old_dram_timing2 = RREG32(MC_ARB_DRAM_TIMING2);
+
+       radeon_atom_set_engine_dram_timings(rdev,
+                                           state->high.sclk,
+                                           state->high.mclk);
+
+       dram_timing = RREG32(MC_ARB_DRAM_TIMING);
+       dram_timing2 = RREG32(MC_ARB_DRAM_TIMING2);
+
+       WREG32(MC_ARB_DRAM_TIMING_3, dram_timing);
+       WREG32(MC_ARB_DRAM_TIMING2_3, dram_timing2);
+
+       radeon_atom_set_engine_dram_timings(rdev,
+                                           state->medium.sclk,
+                                           state->medium.mclk);
+
+       dram_timing = RREG32(MC_ARB_DRAM_TIMING);
+       dram_timing2 = RREG32(MC_ARB_DRAM_TIMING2);
+
+       WREG32(MC_ARB_DRAM_TIMING_2, dram_timing);
+       WREG32(MC_ARB_DRAM_TIMING2_2, dram_timing2);
+
+       radeon_atom_set_engine_dram_timings(rdev,
+                                           state->low.sclk,
+                                           state->low.mclk);
+
+       dram_timing = RREG32(MC_ARB_DRAM_TIMING);
+       dram_timing2 = RREG32(MC_ARB_DRAM_TIMING2);
+
+       WREG32(MC_ARB_DRAM_TIMING_1, dram_timing);
+       WREG32(MC_ARB_DRAM_TIMING2_1, dram_timing2);
+
+       /* restore the boot dram timings */
+       WREG32(MC_ARB_DRAM_TIMING, old_dram_timing);
+       WREG32(MC_ARB_DRAM_TIMING2, old_dram_timing2);
+
+}
+
+void rv730_start_dpm(struct radeon_device *rdev)
+{
+       WREG32_P(SCLK_PWRMGT_CNTL, 0, ~SCLK_PWRMGT_OFF);
+
+       WREG32_P(TCI_MCLK_PWRMGT_CNTL, 0, ~MPLL_PWRMGT_OFF);
+
+       WREG32_P(GENERAL_PWRMGT, GLOBAL_PWRMGT_EN, ~GLOBAL_PWRMGT_EN);
+}
+
+void rv730_stop_dpm(struct radeon_device *rdev)
+{
+       PPSMC_Result result;
+
+       result = rv770_send_msg_to_smc(rdev, PPSMC_MSG_TwoLevelsDisabled);
+
+       if (result != PPSMC_Result_OK)
+               DRM_ERROR("Could not force DPM to low\n");
+
+       WREG32_P(GENERAL_PWRMGT, 0, ~GLOBAL_PWRMGT_EN);
+
+       WREG32_P(SCLK_PWRMGT_CNTL, SCLK_PWRMGT_OFF, ~SCLK_PWRMGT_OFF);
+
+       WREG32_P(TCI_MCLK_PWRMGT_CNTL, MPLL_PWRMGT_OFF, ~MPLL_PWRMGT_OFF);
+}
+
+void rv730_program_dcodt(struct radeon_device *rdev, bool use_dcodt)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u32 i = use_dcodt ? 0 : 1;
+       u32 mc4_io_pad_cntl;
+
+       mc4_io_pad_cntl = RREG32(MC4_IO_DQ_PAD_CNTL_D0_I0);
+       mc4_io_pad_cntl &= 0xFFFFFF00;
+       mc4_io_pad_cntl |= pi->odt_value_0[i];
+       WREG32(MC4_IO_DQ_PAD_CNTL_D0_I0, mc4_io_pad_cntl);
+       WREG32(MC4_IO_DQ_PAD_CNTL_D0_I1, mc4_io_pad_cntl);
+
+       mc4_io_pad_cntl = RREG32(MC4_IO_QS_PAD_CNTL_D0_I0);
+       mc4_io_pad_cntl &= 0xFFFFFF00;
+       mc4_io_pad_cntl |= pi->odt_value_1[i];
+       WREG32(MC4_IO_QS_PAD_CNTL_D0_I0, mc4_io_pad_cntl);
+       WREG32(MC4_IO_QS_PAD_CNTL_D0_I1, mc4_io_pad_cntl);
+}
+
+void rv730_get_odt_values(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u32 mc4_io_pad_cntl;
+
+       pi->odt_value_0[0] = (u8)0;
+       pi->odt_value_1[0] = (u8)0x80;
+
+       mc4_io_pad_cntl = RREG32(MC4_IO_DQ_PAD_CNTL_D0_I0);
+       pi->odt_value_0[1] = (u8)(mc4_io_pad_cntl & 0xff);
+
+       mc4_io_pad_cntl = RREG32(MC4_IO_QS_PAD_CNTL_D0_I0);
+       pi->odt_value_1[1] = (u8)(mc4_io_pad_cntl & 0xff);
+}
diff --git a/drivers/gpu/drm/radeon/rv730d.h b/drivers/gpu/drm/radeon/rv730d.h
new file mode 100644
index 0000000..f0a7954
--- /dev/null
+++ b/drivers/gpu/drm/radeon/rv730d.h
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2011 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+#ifndef RV730_H
+#define RV730_H
+
+#define        CG_SPLL_FUNC_CNTL                               0x600
+#define                SPLL_RESET                              (1 << 0)
+#define                SPLL_SLEEP                              (1 << 1)
+#define                SPLL_DIVEN                              (1 << 2)
+#define                SPLL_BYPASS_EN                          (1 << 3)
+#define                SPLL_REF_DIV(x)                         ((x) << 4)
+#define                SPLL_REF_DIV_MASK                       (0x3f << 4)
+#define                SPLL_HILEN(x)                           ((x) << 12)
+#define                SPLL_HILEN_MASK                         (0xf << 12)
+#define                SPLL_LOLEN(x)                           ((x) << 16)
+#define                SPLL_LOLEN_MASK                         (0xf << 16)
+#define        CG_SPLL_FUNC_CNTL_2                             0x604
+#define                SCLK_MUX_SEL(x)                         ((x) << 0)
+#define                SCLK_MUX_SEL_MASK                       (0x1ff << 0)
+#define        CG_SPLL_FUNC_CNTL_3                             0x608
+#define                SPLL_FB_DIV(x)                          ((x) << 0)
+#define                SPLL_FB_DIV_MASK                        (0x3ffffff << 0)
+#define                SPLL_DITHEN                             (1 << 28)
+
+#define        CG_MPLL_FUNC_CNTL                               0x624
+#define                MPLL_RESET                              (1 << 0)
+#define                MPLL_SLEEP                              (1 << 1)
+#define                MPLL_DIVEN                              (1 << 2)
+#define                MPLL_BYPASS_EN                          (1 << 3)
+#define                MPLL_REF_DIV(x)                         ((x) << 4)
+#define                MPLL_REF_DIV_MASK                       (0x3f << 4)
+#define                MPLL_HILEN(x)                           ((x) << 12)
+#define                MPLL_HILEN_MASK                         (0xf << 12)
+#define                MPLL_LOLEN(x)                           ((x) << 16)
+#define                MPLL_LOLEN_MASK                         (0xf << 16)
+#define        CG_MPLL_FUNC_CNTL_2                             0x628
+#define                MCLK_MUX_SEL(x)                         ((x) << 0)
+#define                MCLK_MUX_SEL_MASK                       (0x1ff << 0)
+#define        CG_MPLL_FUNC_CNTL_3                             0x62c
+#define                MPLL_FB_DIV(x)                          ((x) << 0)
+#define                MPLL_FB_DIV_MASK                        (0x3ffffff << 0)
+#define                MPLL_DITHEN                             (1 << 28)
+
+#define        CG_TCI_MPLL_SPREAD_SPECTRUM                     0x634
+#define        CG_TCI_MPLL_SPREAD_SPECTRUM_2                   0x638
+#define GENERAL_PWRMGT                                  0x63c
+#       define GLOBAL_PWRMGT_EN                         (1 << 0)
+#       define STATIC_PM_EN                             (1 << 1)
+#       define THERMAL_PROTECTION_DIS                   (1 << 2)
+#       define THERMAL_PROTECTION_TYPE                  (1 << 3)
+#       define ENABLE_GEN2PCIE                          (1 << 4)
+#       define ENABLE_GEN2XSP                           (1 << 5)
+#       define SW_SMIO_INDEX(x)                         ((x) << 6)
+#       define SW_SMIO_INDEX_MASK                       (3 << 6)
+#       define LOW_VOLT_D2_ACPI                         (1 << 8)
+#       define LOW_VOLT_D3_ACPI                         (1 << 9)
+#       define VOLT_PWRMGT_EN                           (1 << 10)
+#       define BACKBIAS_PAD_EN                          (1 << 18)
+#       define BACKBIAS_VALUE                           (1 << 19)
+#       define DYN_SPREAD_SPECTRUM_EN                   (1 << 23)
+#       define AC_DC_SW                                 (1 << 24)
+
+#define SCLK_PWRMGT_CNTL                                  0x644
+#       define SCLK_PWRMGT_OFF                            (1 << 0)
+#       define SCLK_LOW_D1                                (1 << 1)
+#       define FIR_RESET                                  (1 << 4)
+#       define FIR_FORCE_TREND_SEL                        (1 << 5)
+#       define FIR_TREND_MODE                             (1 << 6)
+#       define DYN_GFX_CLK_OFF_EN                         (1 << 7)
+#       define GFX_CLK_FORCE_ON                           (1 << 8)
+#       define GFX_CLK_REQUEST_OFF                        (1 << 9)
+#       define GFX_CLK_FORCE_OFF                          (1 << 10)
+#       define GFX_CLK_OFF_ACPI_D1                        (1 << 11)
+#       define GFX_CLK_OFF_ACPI_D2                        (1 << 12)
+#       define GFX_CLK_OFF_ACPI_D3                        (1 << 13)
+
+#define        TCI_MCLK_PWRMGT_CNTL                            0x648
+#       define MPLL_PWRMGT_OFF                          (1 << 5)
+#       define DLL_READY                                (1 << 6)
+#       define MC_INT_CNTL                              (1 << 7)
+#       define MRDCKA_SLEEP                             (1 << 8)
+#       define MRDCKB_SLEEP                             (1 << 9)
+#       define MRDCKC_SLEEP                             (1 << 10)
+#       define MRDCKD_SLEEP                             (1 << 11)
+#       define MRDCKE_SLEEP                             (1 << 12)
+#       define MRDCKF_SLEEP                             (1 << 13)
+#       define MRDCKG_SLEEP                             (1 << 14)
+#       define MRDCKH_SLEEP                             (1 << 15)
+#       define MRDCKA_RESET                             (1 << 16)
+#       define MRDCKB_RESET                             (1 << 17)
+#       define MRDCKC_RESET                             (1 << 18)
+#       define MRDCKD_RESET                             (1 << 19)
+#       define MRDCKE_RESET                             (1 << 20)
+#       define MRDCKF_RESET                             (1 << 21)
+#       define MRDCKG_RESET                             (1 << 22)
+#       define MRDCKH_RESET                             (1 << 23)
+#       define DLL_READY_READ                           (1 << 24)
+#       define USE_DISPLAY_GAP                          (1 << 25)
+#       define USE_DISPLAY_URGENT_NORMAL                (1 << 26)
+#       define MPLL_TURNOFF_D2                          (1 << 28)
+#define        TCI_DLL_CNTL                                    0x64c
+
+#define        CG_PG_CNTL                                      0x858
+#       define PWRGATE_ENABLE                           (1 << 0)
+
+#define        CG_AT                                           0x6d4
+#define                CG_R(x)                                 ((x) << 0)
+#define                CG_R_MASK                               (0xffff << 0)
+#define                CG_L(x)                                 ((x) << 16)
+#define                CG_L_MASK                               (0xffff << 16)
+
+#define        CG_SPLL_SPREAD_SPECTRUM                         0x790
+#define                SSEN                                    (1 << 0)
+#define                CLK_S(x)                                ((x) << 4)
+#define                CLK_S_MASK                              (0xfff << 4)
+#define        CG_SPLL_SPREAD_SPECTRUM_2                       0x794
+#define                CLK_V(x)                                ((x) << 0)
+#define                CLK_V_MASK                              (0x3ffffff << 0)
+
+#define        MC_ARB_DRAM_TIMING                              0x2774
+#define        MC_ARB_DRAM_TIMING2                             0x2778
+
+#define        MC_ARB_RFSH_RATE                                0x27b0
+#define                POWERMODE0(x)                           ((x) << 0)
+#define                POWERMODE0_MASK                         (0xff << 0)
+#define                POWERMODE1(x)                           ((x) << 8)
+#define                POWERMODE1_MASK                         (0xff << 8)
+#define                POWERMODE2(x)                           ((x) << 16)
+#define                POWERMODE2_MASK                         (0xff << 16)
+#define                POWERMODE3(x)                           ((x) << 24)
+#define                POWERMODE3_MASK                         (0xff << 24)
+
+#define        MC_ARB_DRAM_TIMING_1                            0x27f0
+#define        MC_ARB_DRAM_TIMING_2                            0x27f4
+#define        MC_ARB_DRAM_TIMING_3                            0x27f8
+#define        MC_ARB_DRAM_TIMING2_1                           0x27fc
+#define        MC_ARB_DRAM_TIMING2_2                           0x2800
+#define        MC_ARB_DRAM_TIMING2_3                           0x2804
+
+#define        MC4_IO_DQ_PAD_CNTL_D0_I0                        0x2978
+#define        MC4_IO_DQ_PAD_CNTL_D0_I1                        0x297c
+#define        MC4_IO_QS_PAD_CNTL_D0_I0                        0x2980
+#define        MC4_IO_QS_PAD_CNTL_D0_I1                        0x2984
+
+#endif
diff --git a/drivers/gpu/drm/radeon/rv740_dpm.c 
b/drivers/gpu/drm/radeon/rv740_dpm.c
new file mode 100644
index 0000000..d0d750e
--- /dev/null
+++ b/drivers/gpu/drm/radeon/rv740_dpm.c
@@ -0,0 +1,417 @@
+/*
+ * Copyright 2011 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Alex Deucher
+ */
+
+#include "drmP.h"
+#include "radeon.h"
+#include "rv740d.h"
+#include "r600_dpm.h"
+#include "rv770_dpm.h"
+#include "atom.h"
+
+struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps);
+struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev);
+
+u32 rv740_get_decoded_reference_divider(u32 encoded_ref)
+{
+       u32 ref = 0;
+
+       switch (encoded_ref) {
+        case 0:
+               ref = 1;
+               break;
+        case 16:
+               ref = 2;
+               break;
+        case 17:
+               ref = 3;
+               break;
+        case 18:
+               ref = 2;
+               break;
+        case 19:
+               ref = 3;
+               break;
+        case 20:
+               ref = 4;
+               break;
+        case 21:
+               ref = 5;
+               break;
+        default:
+               DRM_ERROR("Invalid encoded Reference Divider\n");
+               ref = 0;
+               break;
+       }
+
+       return ref;
+}
+
+struct dll_speed_setting {
+       u16 min;
+       u16 max;
+       u32 dll_speed;
+};
+
+static struct dll_speed_setting dll_speed_table[16] =
+{
+       { 270, 320, 0x0f },
+       { 240, 270, 0x0e },
+       { 200, 240, 0x0d },
+       { 180, 200, 0x0c },
+       { 160, 180, 0x0b },
+       { 140, 160, 0x0a },
+       { 120, 140, 0x09 },
+       { 110, 120, 0x08 },
+       {  95, 110, 0x07 },
+       {  85,  95, 0x06 },
+       {  78,  85, 0x05 },
+       {  70,  78, 0x04 },
+       {  65,  70, 0x03 },
+       {  60,  65, 0x02 },
+       {  42,  60, 0x01 },
+       {  00,  42, 0x00 }
+};
+
+u32 rv740_get_dll_speed(bool is_gddr5, u32 memory_clock)
+{
+       int i;
+       u32 factor;
+       u16 data_rate;
+
+       if (is_gddr5)
+               factor = 4;
+       else
+               factor = 2;
+
+       data_rate = (u16)(memory_clock * factor / 1000);
+
+       if (data_rate < dll_speed_table[0].max) {
+               for (i = 0; i < 16; i++) {
+                       if (data_rate > dll_speed_table[i].min &&
+                           data_rate <= dll_speed_table[i].max)
+                               return dll_speed_table[i].dll_speed;
+               }
+       }
+
+       DRM_DEBUG_KMS("Target MCLK greater than largest MCLK in DLL speed 
table\n");
+
+       return 0x0f;
+}
+
+int rv740_populate_sclk_value(struct radeon_device *rdev, u32 engine_clock,
+                             RV770_SMC_SCLK_VALUE *sclk)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       struct atom_clock_dividers dividers;
+       u32 spll_func_cntl = pi->clk_regs.rv770.cg_spll_func_cntl;
+       u32 spll_func_cntl_2 = pi->clk_regs.rv770.cg_spll_func_cntl_2;
+       u32 spll_func_cntl_3 = pi->clk_regs.rv770.cg_spll_func_cntl_3;
+       u32 cg_spll_spread_spectrum = 
pi->clk_regs.rv770.cg_spll_spread_spectrum;
+       u32 cg_spll_spread_spectrum_2 = 
pi->clk_regs.rv770.cg_spll_spread_spectrum_2;
+       u64 tmp;
+       u32 reference_clock = rdev->clock.spll.reference_freq;
+       u32 reference_divider;
+       u32 fbdiv;
+       int ret;
+
+       ret = radeon_atom_get_clock_dividers(rdev, COMPUTE_ENGINE_PLL_PARAM,
+                                            engine_clock, false, &dividers);
+       if (ret)
+               return ret;
+
+       reference_divider = 1 + dividers.ref_div;
+
+       tmp = (u64) engine_clock * reference_divider * dividers.post_div;
+
+       fbdiv = (u32) ((16384 * tmp) / reference_clock);
+
+       spll_func_cntl &= ~(SPLL_PDIV_A_MASK | SPLL_REF_DIV_MASK);
+       spll_func_cntl |= SPLL_REF_DIV(dividers.ref_div);
+       spll_func_cntl |= SPLL_PDIV_A(dividers.post_div);
+
+       spll_func_cntl_2 &= ~SCLK_MUX_SEL_MASK;
+       spll_func_cntl_2 |= SCLK_MUX_SEL(2);
+
+       spll_func_cntl_3 &= ~SPLL_FB_DIV_MASK;
+       spll_func_cntl_3 |= SPLL_FB_DIV(fbdiv);
+       spll_func_cntl_3 |= SPLL_DITHEN;
+
+       if (pi->sclk_ss) {
+               struct radeon_atom_ss ss;
+               u32 vco_freq = engine_clock * dividers.post_div;
+
+               if (radeon_atombios_get_asic_ss_info(rdev, &ss,
+                                                    ASIC_INTERNAL_ENGINE_SS, 
vco_freq)) {
+                       u32 clk_s = reference_clock * 5 / (reference_divider * 
ss.rate);
+                       u32 clk_v = 4 * ss.percentage * fbdiv / (clk_s * 10000);
+
+                       cg_spll_spread_spectrum &= ~CLK_S_MASK;
+                       cg_spll_spread_spectrum |= CLK_S(clk_s);
+                       cg_spll_spread_spectrum |= SSEN;
+
+                       cg_spll_spread_spectrum_2 &= ~CLK_V_MASK;
+                       cg_spll_spread_spectrum_2 |= CLK_V(clk_v);
+               }
+       }
+
+       sclk->sclk_value = cpu_to_be32(engine_clock);
+       sclk->vCG_SPLL_FUNC_CNTL = cpu_to_be32(spll_func_cntl);
+       sclk->vCG_SPLL_FUNC_CNTL_2 = cpu_to_be32(spll_func_cntl_2);
+       sclk->vCG_SPLL_FUNC_CNTL_3 = cpu_to_be32(spll_func_cntl_3);
+       sclk->vCG_SPLL_SPREAD_SPECTRUM = cpu_to_be32(cg_spll_spread_spectrum);
+       sclk->vCG_SPLL_SPREAD_SPECTRUM_2 = 
cpu_to_be32(cg_spll_spread_spectrum_2);
+
+       return 0;
+}
+
+int rv740_populate_mclk_value(struct radeon_device *rdev,
+                             u32 engine_clock, u32 memory_clock,
+                             RV7XX_SMC_MCLK_VALUE *mclk)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u32 mpll_ad_func_cntl = pi->clk_regs.rv770.mpll_ad_func_cntl;
+       u32 mpll_ad_func_cntl_2 = pi->clk_regs.rv770.mpll_ad_func_cntl_2;
+       u32 mpll_dq_func_cntl = pi->clk_regs.rv770.mpll_dq_func_cntl;
+       u32 mpll_dq_func_cntl_2 = pi->clk_regs.rv770.mpll_dq_func_cntl_2;
+       u32 mclk_pwrmgt_cntl = pi->clk_regs.rv770.mclk_pwrmgt_cntl;
+       u32 dll_cntl = pi->clk_regs.rv770.dll_cntl;
+       u32 mpll_ss1 = pi->clk_regs.rv770.mpll_ss1;
+       u32 mpll_ss2 = pi->clk_regs.rv770.mpll_ss2;
+       struct atom_clock_dividers dividers;
+       u32 ibias;
+       u32 dll_speed;
+       int ret;
+
+       ret = radeon_atom_get_clock_dividers(rdev, COMPUTE_MEMORY_PLL_PARAM,
+                                            memory_clock, false, &dividers);
+       if (ret)
+               return ret;
+
+       ibias = rv770_map_clkf_to_ibias(rdev, dividers.whole_fb_div);
+
+       mpll_ad_func_cntl &= ~(CLKR_MASK |
+                              YCLK_POST_DIV_MASK |
+                              CLKF_MASK |
+                              CLKFRAC_MASK |
+                              IBIAS_MASK);
+       mpll_ad_func_cntl |= CLKR(dividers.ref_div);
+       mpll_ad_func_cntl |= YCLK_POST_DIV(dividers.post_div);
+       mpll_ad_func_cntl |= CLKF(dividers.whole_fb_div);
+       mpll_ad_func_cntl |= CLKFRAC(dividers.frac_fb_div);
+       mpll_ad_func_cntl |= IBIAS(ibias);
+
+       if (dividers.vco_mode)
+               mpll_ad_func_cntl_2 |= VCO_MODE;
+       else
+               mpll_ad_func_cntl_2 &= ~VCO_MODE;
+
+       if (pi->mem_gddr5) {
+               mpll_dq_func_cntl &= ~(CLKR_MASK |
+                                      YCLK_POST_DIV_MASK |
+                                      CLKF_MASK |
+                                      CLKFRAC_MASK |
+                                      IBIAS_MASK);
+               mpll_dq_func_cntl |= CLKR(dividers.ref_div);
+               mpll_dq_func_cntl |= YCLK_POST_DIV(dividers.post_div);
+               mpll_dq_func_cntl |= CLKF(dividers.whole_fb_div);
+               mpll_dq_func_cntl |= CLKFRAC(dividers.frac_fb_div);
+               mpll_dq_func_cntl |= IBIAS(ibias);
+
+               if (dividers.vco_mode)
+                       mpll_dq_func_cntl_2 |= VCO_MODE;
+               else
+                       mpll_dq_func_cntl_2 &= ~VCO_MODE;
+       }
+
+       if (pi->mclk_ss) {
+               struct radeon_atom_ss ss;
+               u32 vco_freq = memory_clock * dividers.post_div;
+
+               if (radeon_atombios_get_asic_ss_info(rdev, &ss,
+                                                    ASIC_INTERNAL_MEMORY_SS, 
vco_freq)) {
+                       u32 reference_clock = rdev->clock.mpll.reference_freq;
+                       u32 decoded_ref = 
rv740_get_decoded_reference_divider(dividers.ref_div);
+                       u32 clk_s = reference_clock * 5 / (decoded_ref * 
ss.rate);
+                       u32 clk_v = 0x40000 * ss.percentage *
+                               (dividers.whole_fb_div + (dividers.frac_fb_div 
/ 8)) / (clk_s * 10000);
+
+                       mpll_ss1 &= ~CLKV_MASK;
+                       mpll_ss1 |= CLKV(clk_v);
+
+                       mpll_ss2 &= ~CLKS_MASK;
+                       mpll_ss2 |= CLKS(clk_s);
+               }
+       }
+
+       dll_speed = rv740_get_dll_speed(pi->mem_gddr5,
+                                       memory_clock);
+
+       mclk_pwrmgt_cntl &= ~DLL_SPEED_MASK;
+       mclk_pwrmgt_cntl |= DLL_SPEED(dll_speed);
+
+       mclk->mclk770.mclk_value = cpu_to_be32(memory_clock);
+       mclk->mclk770.vMPLL_AD_FUNC_CNTL = cpu_to_be32(mpll_ad_func_cntl);
+       mclk->mclk770.vMPLL_AD_FUNC_CNTL_2 = cpu_to_be32(mpll_ad_func_cntl_2);
+       mclk->mclk770.vMPLL_DQ_FUNC_CNTL = cpu_to_be32(mpll_dq_func_cntl);
+       mclk->mclk770.vMPLL_DQ_FUNC_CNTL_2 = cpu_to_be32(mpll_dq_func_cntl_2);
+       mclk->mclk770.vMCLK_PWRMGT_CNTL = cpu_to_be32(mclk_pwrmgt_cntl);
+       mclk->mclk770.vDLL_CNTL = cpu_to_be32(dll_cntl);
+       mclk->mclk770.vMPLL_SS = cpu_to_be32(mpll_ss1);
+       mclk->mclk770.vMPLL_SS2 = cpu_to_be32(mpll_ss2);
+
+       return 0;
+}
+
+void rv740_read_clock_registers(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       pi->clk_regs.rv770.cg_spll_func_cntl =
+               RREG32(CG_SPLL_FUNC_CNTL);
+       pi->clk_regs.rv770.cg_spll_func_cntl_2 =
+               RREG32(CG_SPLL_FUNC_CNTL_2);
+       pi->clk_regs.rv770.cg_spll_func_cntl_3 =
+               RREG32(CG_SPLL_FUNC_CNTL_3);
+       pi->clk_regs.rv770.cg_spll_spread_spectrum =
+               RREG32(CG_SPLL_SPREAD_SPECTRUM);
+       pi->clk_regs.rv770.cg_spll_spread_spectrum_2 =
+               RREG32(CG_SPLL_SPREAD_SPECTRUM_2);
+
+       pi->clk_regs.rv770.mpll_ad_func_cntl =
+               RREG32(MPLL_AD_FUNC_CNTL);
+       pi->clk_regs.rv770.mpll_ad_func_cntl_2 =
+               RREG32(MPLL_AD_FUNC_CNTL_2);
+       pi->clk_regs.rv770.mpll_dq_func_cntl =
+               RREG32(MPLL_DQ_FUNC_CNTL);
+       pi->clk_regs.rv770.mpll_dq_func_cntl_2 =
+               RREG32(MPLL_DQ_FUNC_CNTL_2);
+       pi->clk_regs.rv770.mclk_pwrmgt_cntl =
+               RREG32(MCLK_PWRMGT_CNTL);
+       pi->clk_regs.rv770.dll_cntl = RREG32(DLL_CNTL);
+       pi->clk_regs.rv770.mpll_ss1 = RREG32(MPLL_SS1);
+       pi->clk_regs.rv770.mpll_ss2 = RREG32(MPLL_SS2);
+}
+
+int rv740_populate_smc_acpi_state(struct radeon_device *rdev,
+                                 RV770_SMC_STATETABLE *table)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u32 mpll_ad_func_cntl = pi->clk_regs.rv770.mpll_ad_func_cntl;
+       u32 mpll_ad_func_cntl_2 = pi->clk_regs.rv770.mpll_ad_func_cntl_2;
+       u32 mpll_dq_func_cntl = pi->clk_regs.rv770.mpll_dq_func_cntl;
+       u32 mpll_dq_func_cntl_2 = pi->clk_regs.rv770.mpll_dq_func_cntl_2;
+       u32 spll_func_cntl = pi->clk_regs.rv770.cg_spll_func_cntl;
+       u32 spll_func_cntl_2 = pi->clk_regs.rv770.cg_spll_func_cntl_2;
+       u32 spll_func_cntl_3 = pi->clk_regs.rv770.cg_spll_func_cntl_3;
+       u32 mclk_pwrmgt_cntl = pi->clk_regs.rv770.mclk_pwrmgt_cntl;
+       u32 dll_cntl = pi->clk_regs.rv770.dll_cntl;
+
+       table->ACPIState = table->initialState;
+
+       table->ACPIState.flags &= ~PPSMC_SWSTATE_FLAG_DC;
+
+       if (pi->acpi_vddc) {
+               rv770_populate_vddc_value(rdev, pi->acpi_vddc,
+                                         &table->ACPIState.levels[0].vddc);
+               table->ACPIState.levels[0].gen2PCIE =
+                       pi->pcie_gen2 ?
+                       pi->acpi_pcie_gen2 : 0;
+               table->ACPIState.levels[0].gen2XSP =
+                       pi->acpi_pcie_gen2;
+       } else {
+               rv770_populate_vddc_value(rdev, pi->min_vddc_in_table,
+                                         &table->ACPIState.levels[0].vddc);
+               table->ACPIState.levels[0].gen2PCIE = 0;
+       }
+
+       mpll_ad_func_cntl_2 |= BIAS_GEN_PDNB | RESET_EN;
+
+       mpll_dq_func_cntl_2 |= BYPASS | BIAS_GEN_PDNB | RESET_EN;
+
+       mclk_pwrmgt_cntl |= (MRDCKA0_RESET |
+                            MRDCKA1_RESET |
+                            MRDCKB0_RESET |
+                            MRDCKB1_RESET |
+                            MRDCKC0_RESET |
+                            MRDCKC1_RESET |
+                            MRDCKD0_RESET |
+                            MRDCKD1_RESET);
+
+       dll_cntl |= (MRDCKA0_BYPASS |
+                    MRDCKA1_BYPASS |
+                    MRDCKB0_BYPASS |
+                    MRDCKB1_BYPASS |
+                    MRDCKC0_BYPASS |
+                    MRDCKC1_BYPASS |
+                    MRDCKD0_BYPASS |
+                    MRDCKD1_BYPASS);
+
+       spll_func_cntl |= SPLL_RESET | SPLL_SLEEP | SPLL_BYPASS_EN;
+
+       spll_func_cntl_2 &= ~SCLK_MUX_SEL_MASK;
+       spll_func_cntl_2 |= SCLK_MUX_SEL(4);
+
+       table->ACPIState.levels[0].mclk.mclk770.vMPLL_AD_FUNC_CNTL = 
cpu_to_be32(mpll_ad_func_cntl);
+       table->ACPIState.levels[0].mclk.mclk770.vMPLL_AD_FUNC_CNTL_2 = 
cpu_to_be32(mpll_ad_func_cntl_2);
+       table->ACPIState.levels[0].mclk.mclk770.vMPLL_DQ_FUNC_CNTL = 
cpu_to_be32(mpll_dq_func_cntl);
+       table->ACPIState.levels[0].mclk.mclk770.vMPLL_DQ_FUNC_CNTL_2 = 
cpu_to_be32(mpll_dq_func_cntl_2);
+       table->ACPIState.levels[0].mclk.mclk770.vMCLK_PWRMGT_CNTL = 
cpu_to_be32(mclk_pwrmgt_cntl);
+       table->ACPIState.levels[0].mclk.mclk770.vDLL_CNTL = 
cpu_to_be32(dll_cntl);
+
+       table->ACPIState.levels[0].mclk.mclk770.mclk_value = 0;
+
+       table->ACPIState.levels[0].sclk.vCG_SPLL_FUNC_CNTL = 
cpu_to_be32(spll_func_cntl);
+       table->ACPIState.levels[0].sclk.vCG_SPLL_FUNC_CNTL_2 = 
cpu_to_be32(spll_func_cntl_2);
+       table->ACPIState.levels[0].sclk.vCG_SPLL_FUNC_CNTL_3 = 
cpu_to_be32(spll_func_cntl_3);
+
+       table->ACPIState.levels[0].sclk.sclk_value = 0;
+
+       table->ACPIState.levels[1] = table->ACPIState.levels[0];
+       table->ACPIState.levels[2] = table->ACPIState.levels[0];
+
+       rv770_populate_mvdd_value(rdev, 0, &table->ACPIState.levels[0].mvdd);
+
+       return 0;
+}
+
+void rv740_enable_mclk_spread_spectrum(struct radeon_device *rdev,
+                                      bool enable)
+{
+       if (enable)
+               WREG32_P(MPLL_CNTL_MODE, SS_SSEN, ~SS_SSEN);
+       else
+               WREG32_P(MPLL_CNTL_MODE, 0, ~SS_SSEN);
+}
+
+u8 rv740_get_mclk_frequency_ratio(u32 memory_clock)
+{
+       u8 mc_para_index;
+
+       if ((memory_clock < 10000) || (memory_clock > 47500))
+               mc_para_index = 0x00;
+       else
+               mc_para_index = (u8)((memory_clock - 10000) / 2500);
+
+       return mc_para_index;
+}
diff --git a/drivers/gpu/drm/radeon/rv740d.h b/drivers/gpu/drm/radeon/rv740d.h
new file mode 100644
index 0000000..fe5ab07
--- /dev/null
+++ b/drivers/gpu/drm/radeon/rv740d.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2011 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+#ifndef RV740_H
+#define RV740_H
+
+#define        CG_SPLL_FUNC_CNTL                               0x600
+#define                SPLL_RESET                              (1 << 0)
+#define                SPLL_SLEEP                              (1 << 1)
+#define                SPLL_BYPASS_EN                          (1 << 3)
+#define                SPLL_REF_DIV(x)                         ((x) << 4)
+#define                SPLL_REF_DIV_MASK                       (0x3f << 4)
+#define                SPLL_PDIV_A(x)                          ((x) << 20)
+#define                SPLL_PDIV_A_MASK                        (0x7f << 20)
+#define        CG_SPLL_FUNC_CNTL_2                             0x604
+#define                SCLK_MUX_SEL(x)                         ((x) << 0)
+#define                SCLK_MUX_SEL_MASK                       (0x1ff << 0)
+#define        CG_SPLL_FUNC_CNTL_3                             0x608
+#define                SPLL_FB_DIV(x)                          ((x) << 0)
+#define                SPLL_FB_DIV_MASK                        (0x3ffffff << 0)
+#define                SPLL_DITHEN                             (1 << 28)
+
+#define        MPLL_CNTL_MODE                                  0x61c
+#define                SS_SSEN                                 (1 << 24)
+
+#define        MPLL_AD_FUNC_CNTL                               0x624
+#define                CLKF(x)                                 ((x) << 0)
+#define                CLKF_MASK                               (0x7f << 0)
+#define                CLKR(x)                                 ((x) << 7)
+#define                CLKR_MASK                               (0x1f << 7)
+#define                CLKFRAC(x)                              ((x) << 12)
+#define                CLKFRAC_MASK                            (0x1f << 12)
+#define                YCLK_POST_DIV(x)                        ((x) << 17)
+#define                YCLK_POST_DIV_MASK                      (3 << 17)
+#define                IBIAS(x)                                ((x) << 20)
+#define                IBIAS_MASK                              (0x3ff << 20)
+#define                RESET                                   (1 << 30)
+#define                PDNB                                    (1 << 31)
+#define        MPLL_AD_FUNC_CNTL_2                             0x628
+#define                BYPASS                                  (1 << 19)
+#define                BIAS_GEN_PDNB                           (1 << 24)
+#define                RESET_EN                                (1 << 25)
+#define                VCO_MODE                                (1 << 29)
+#define        MPLL_DQ_FUNC_CNTL                               0x62c
+#define        MPLL_DQ_FUNC_CNTL_2                             0x630
+
+#define        MCLK_PWRMGT_CNTL                                0x648
+#define                DLL_SPEED(x)                            ((x) << 0)
+#define                DLL_SPEED_MASK                          (0x1f << 0)
+#       define MPLL_PWRMGT_OFF                          (1 << 5)
+#       define DLL_READY                                (1 << 6)
+#       define MC_INT_CNTL                              (1 << 7)
+#       define MRDCKA0_SLEEP                            (1 << 8)
+#       define MRDCKA1_SLEEP                            (1 << 9)
+#       define MRDCKB0_SLEEP                            (1 << 10)
+#       define MRDCKB1_SLEEP                            (1 << 11)
+#       define MRDCKC0_SLEEP                            (1 << 12)
+#       define MRDCKC1_SLEEP                            (1 << 13)
+#       define MRDCKD0_SLEEP                            (1 << 14)
+#       define MRDCKD1_SLEEP                            (1 << 15)
+#       define MRDCKA0_RESET                            (1 << 16)
+#       define MRDCKA1_RESET                            (1 << 17)
+#       define MRDCKB0_RESET                            (1 << 18)
+#       define MRDCKB1_RESET                            (1 << 19)
+#       define MRDCKC0_RESET                            (1 << 20)
+#       define MRDCKC1_RESET                            (1 << 21)
+#       define MRDCKD0_RESET                            (1 << 22)
+#       define MRDCKD1_RESET                            (1 << 23)
+#       define DLL_READY_READ                           (1 << 24)
+#       define USE_DISPLAY_GAP                          (1 << 25)
+#       define USE_DISPLAY_URGENT_NORMAL                (1 << 26)
+#       define MPLL_TURNOFF_D2                          (1 << 28)
+#define        DLL_CNTL                                        0x64c
+#       define MRDCKA0_BYPASS                           (1 << 24)
+#       define MRDCKA1_BYPASS                           (1 << 25)
+#       define MRDCKB0_BYPASS                           (1 << 26)
+#       define MRDCKB1_BYPASS                           (1 << 27)
+#       define MRDCKC0_BYPASS                           (1 << 28)
+#       define MRDCKC1_BYPASS                           (1 << 29)
+#       define MRDCKD0_BYPASS                           (1 << 30)
+#       define MRDCKD1_BYPASS                           (1 << 31)
+
+#define        CG_SPLL_SPREAD_SPECTRUM                         0x790
+#define                SSEN                                    (1 << 0)
+#define                CLK_S(x)                                ((x) << 4)
+#define                CLK_S_MASK                              (0xfff << 4)
+#define        CG_SPLL_SPREAD_SPECTRUM_2                       0x794
+#define                CLK_V(x)                                ((x) << 0)
+#define                CLK_V_MASK                              (0x3ffffff << 0)
+
+#define        MPLL_SS1                                        0x85c
+#define                CLKV(x)                                 ((x) << 0)
+#define                CLKV_MASK                               (0x3ffffff << 0)
+#define        MPLL_SS2                                        0x860
+#define                CLKS(x)                                 ((x) << 0)
+#define                CLKS_MASK                               (0xfff << 0)
+
+#endif
diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c 
b/drivers/gpu/drm/radeon/rv770_dpm.c
new file mode 100644
index 0000000..81660a6
--- /dev/null
+++ b/drivers/gpu/drm/radeon/rv770_dpm.c
@@ -0,0 +1,2325 @@
+/*
+ * Copyright 2011 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Alex Deucher
+ */
+
+#include "drmP.h"
+#include "radeon.h"
+#include "rv770d.h"
+#include "r600_dpm.h"
+#include "rv770_dpm.h"
+#include "atom.h"
+
+#define MC_CG_ARB_FREQ_F0           0x0a
+#define MC_CG_ARB_FREQ_F1           0x0b
+#define MC_CG_ARB_FREQ_F2           0x0c
+#define MC_CG_ARB_FREQ_F3           0x0d
+
+#define MC_CG_SEQ_DRAMCONF_S0       0x05
+#define MC_CG_SEQ_DRAMCONF_S1       0x06
+
+#define PCIE_BUS_CLK                10000
+#define TCLK                        (PCIE_BUS_CLK / 10)
+
+#define SMC_RAM_END 0xC000
+
+struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps)
+{
+       struct rv7xx_ps *ps = rps->ps_priv;
+
+       return ps;
+}
+
+struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rdev->pm.dpm.priv;
+
+       return pi;
+}
+
+static void rv770_enable_bif_dynamic_pcie_gen2(struct radeon_device *rdev,
+                                              bool enable)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u32 tmp;
+
+       tmp = RREG32_PCIE_PORT(PCIE_LC_SPEED_CNTL);
+       if (enable) {
+               tmp &= ~LC_HW_VOLTAGE_IF_CONTROL_MASK;
+               tmp |= LC_HW_VOLTAGE_IF_CONTROL(1);
+               tmp |= LC_GEN2_EN_STRAP;
+       } else {
+               if (!pi->boot_in_gen2) {
+                       tmp &= ~LC_HW_VOLTAGE_IF_CONTROL_MASK;
+                       tmp &= ~LC_GEN2_EN_STRAP;
+               }
+       }
+       if ((tmp & LC_OTHER_SIDE_EVER_SENT_GEN2) ||
+           (tmp & LC_OTHER_SIDE_SUPPORTS_GEN2))
+               WREG32_PCIE_PORT(PCIE_LC_SPEED_CNTL, tmp);
+
+}
+
+static void rv770_enable_l0s(struct radeon_device *rdev)
+{
+       u32 tmp;
+
+       tmp = RREG32_PCIE_PORT(PCIE_LC_CNTL) & ~LC_L0S_INACTIVITY_MASK;
+       tmp |= LC_L0S_INACTIVITY(3);
+       WREG32_PCIE_PORT(PCIE_LC_CNTL, tmp);
+}
+
+static void rv770_enable_l1(struct radeon_device *rdev)
+{
+       u32 tmp;
+
+       tmp = RREG32_PCIE_PORT(PCIE_LC_CNTL);
+       tmp &= ~LC_L1_INACTIVITY_MASK;
+       tmp |= LC_L1_INACTIVITY(4);
+       tmp &= ~LC_PMI_TO_L1_DIS;
+       tmp &= ~LC_ASPM_TO_L1_DIS;
+       WREG32_PCIE_PORT(PCIE_LC_CNTL, tmp);
+}
+
+static void rv770_enable_pll_sleep_in_l1(struct radeon_device *rdev)
+{
+       u32 tmp;
+
+       tmp = RREG32_PCIE_PORT(PCIE_LC_CNTL) & ~LC_L1_INACTIVITY_MASK;
+       tmp |= LC_L1_INACTIVITY(8);
+       WREG32_PCIE_PORT(PCIE_LC_CNTL, tmp);
+
+       /* NOTE, this is a PCIE indirect reg, not PCIE PORT */
+       tmp = RREG32_PCIE(PCIE_P_CNTL);
+       tmp |= P_PLL_PWRDN_IN_L1L23;
+       tmp &= ~P_PLL_BUF_PDNB;
+       tmp &= ~P_PLL_PDNB;
+       tmp |= P_ALLOW_PRX_FRONTEND_SHUTOFF;
+       WREG32_PCIE(PCIE_P_CNTL, tmp);
+}
+
+static void rv770_gfx_clock_gating_enable(struct radeon_device *rdev,
+                                         bool enable)
+{
+       if (enable)
+               WREG32_P(SCLK_PWRMGT_CNTL, DYN_GFX_CLK_OFF_EN, 
~DYN_GFX_CLK_OFF_EN);
+       else {
+               WREG32_P(SCLK_PWRMGT_CNTL, 0, ~DYN_GFX_CLK_OFF_EN);
+               WREG32_P(SCLK_PWRMGT_CNTL, GFX_CLK_FORCE_ON, ~GFX_CLK_FORCE_ON);
+               WREG32_P(SCLK_PWRMGT_CNTL, 0, ~GFX_CLK_FORCE_ON);
+               RREG32(GB_TILING_CONFIG);
+       }
+}
+
+static void rv770_mg_clock_gating_enable(struct radeon_device *rdev,
+                                        bool enable)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       if (enable) {
+               u32 mgcg_cgtt_local0;
+
+               if (rdev->family == CHIP_RV770)
+                       mgcg_cgtt_local0 = RV770_MGCGTTLOCAL0_DFLT;
+               else
+                       mgcg_cgtt_local0 = RV7XX_MGCGTTLOCAL0_DFLT;
+
+               WREG32(CG_CGTT_LOCAL_0, mgcg_cgtt_local0);
+               WREG32(CG_CGTT_LOCAL_1, (RV770_MGCGTTLOCAL1_DFLT & 0xFFFFCFFF));
+
+               if (pi->mgcgtssm)
+                       WREG32(CGTS_SM_CTRL_REG, RV770_MGCGCGTSSMCTRL_DFLT);
+       } else {
+               WREG32(CG_CGTT_LOCAL_0, 0xFFFFFFFF);
+               WREG32(CG_CGTT_LOCAL_1, 0xFFFFCFFF);
+       }
+}
+
+void rv770_restore_cgcg(struct radeon_device *rdev)
+{
+       bool dpm_en = false, cg_en = false;
+
+       if (RREG32(GENERAL_PWRMGT) & GLOBAL_PWRMGT_EN)
+               dpm_en = true;
+       if (RREG32(SCLK_PWRMGT_CNTL) & DYN_GFX_CLK_OFF_EN)
+               cg_en = true;
+
+       if (dpm_en && !cg_en)
+               WREG32_P(SCLK_PWRMGT_CNTL, DYN_GFX_CLK_OFF_EN, 
~DYN_GFX_CLK_OFF_EN);
+}
+
+static void rv770_start_dpm(struct radeon_device *rdev)
+{
+       WREG32_P(SCLK_PWRMGT_CNTL, 0, ~SCLK_PWRMGT_OFF);
+
+       WREG32_P(MCLK_PWRMGT_CNTL, 0, ~MPLL_PWRMGT_OFF);
+
+       WREG32_P(GENERAL_PWRMGT, GLOBAL_PWRMGT_EN, ~GLOBAL_PWRMGT_EN);
+}
+
+void rv770_stop_dpm(struct radeon_device *rdev)
+{
+       PPSMC_Result result;
+
+       result = rv770_send_msg_to_smc(rdev, PPSMC_MSG_TwoLevelsDisabled);
+
+       if (result != PPSMC_Result_OK)
+               DRM_ERROR("Could not force DPM to low.\n");
+
+       WREG32_P(GENERAL_PWRMGT, 0, ~GLOBAL_PWRMGT_EN);
+
+       WREG32_P(SCLK_PWRMGT_CNTL, SCLK_PWRMGT_OFF, ~SCLK_PWRMGT_OFF);
+
+       WREG32_P(MCLK_PWRMGT_CNTL, MPLL_PWRMGT_OFF, ~MPLL_PWRMGT_OFF);
+}
+
+bool rv770_dpm_enabled(struct radeon_device *rdev)
+{
+       if (RREG32(GENERAL_PWRMGT) & GLOBAL_PWRMGT_EN)
+               return true;
+       else
+               return false;
+}
+
+void rv770_enable_thermal_protection(struct radeon_device *rdev,
+                                    bool enable)
+{
+       if (enable)
+               WREG32_P(GENERAL_PWRMGT, 0, ~THERMAL_PROTECTION_DIS);
+       else
+               WREG32_P(GENERAL_PWRMGT, THERMAL_PROTECTION_DIS, 
~THERMAL_PROTECTION_DIS);
+}
+
+void rv770_enable_acpi_pm(struct radeon_device *rdev)
+{
+       WREG32_P(GENERAL_PWRMGT, STATIC_PM_EN, ~STATIC_PM_EN);
+}
+
+u8 rv770_get_seq_value(struct radeon_device *rdev,
+                      struct rv7xx_pl *pl)
+{
+       return (pl->flags & ATOM_PPLIB_R600_FLAGS_LOWPOWER) ?
+               MC_CG_SEQ_DRAMCONF_S0 : MC_CG_SEQ_DRAMCONF_S1;
+}
+
+int rv770_read_smc_soft_register(struct radeon_device *rdev,
+                                u16 reg_offset, u32 *value)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       return rv770_read_smc_sram_dword(rdev,
+                                        pi->soft_regs_start + reg_offset,
+                                        value, pi->sram_end);
+}
+
+int rv770_write_smc_soft_register(struct radeon_device *rdev,
+                                 u16 reg_offset, u32 value)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       return rv770_write_smc_sram_dword(rdev,
+                                         pi->soft_regs_start + reg_offset,
+                                         value, pi->sram_end);
+}
+
+int rv770_populate_smc_t(struct radeon_device *rdev,
+                        struct radeon_ps *radeon_state,
+                        RV770_SMC_SWSTATE *smc_state)
+{
+       struct rv7xx_ps *state = rv770_get_ps(radeon_state);
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       int i;
+       int a_n;
+       int a_d;
+       u8 l[RV770_SMC_PERFORMANCE_LEVELS_PER_SWSTATE];
+       u8 r[RV770_SMC_PERFORMANCE_LEVELS_PER_SWSTATE];
+       u32 a_t;
+
+       l[0] = 0;
+       r[2] = 100;
+
+       a_n = (int)state->medium.sclk * RV770_LMP_DFLT +
+               (int)state->low.sclk * (R600_AH_DFLT - RV770_RLP_DFLT);
+       a_d = (int)state->low.sclk * (100 - (int)RV770_RLP_DFLT) +
+               (int)state->medium.sclk * RV770_LMP_DFLT;
+
+       l[1] = (u8)(RV770_LMP_DFLT - (int)RV770_LMP_DFLT * a_n / a_d);
+       r[0] = (u8)(RV770_RLP_DFLT + (100 - (int)RV770_RLP_DFLT) * a_n / a_d);
+
+       a_n = (int)state->high.sclk * RV770_LHP_DFLT +
+               (int)state->medium.sclk *
+               (R600_AH_DFLT - RV770_RMP_DFLT);
+       a_d = (int)state->medium.sclk * (100 - (int)RV770_RMP_DFLT) +
+               (int)state->high.sclk * RV770_LHP_DFLT;
+
+       l[2] = (u8)(RV770_LHP_DFLT - (int)RV770_LHP_DFLT * a_n / a_d);
+       r[1] = (u8)(RV770_RMP_DFLT + (100 - (int)RV770_RMP_DFLT) * a_n / a_d);
+
+       for (i = 0; i < (RV770_SMC_PERFORMANCE_LEVELS_PER_SWSTATE - 1); i++) {
+               a_t = CG_R(r[i] * pi->bsp / 200) | CG_L(l[i] * pi->bsp / 200);
+               smc_state->levels[i].aT = cpu_to_be32(a_t);
+       }
+
+       a_t = CG_R(r[RV770_SMC_PERFORMANCE_LEVELS_PER_SWSTATE - 1] * pi->pbsp / 
200) |
+               CG_L(l[RV770_SMC_PERFORMANCE_LEVELS_PER_SWSTATE - 1] * pi->pbsp 
/ 200);
+
+       smc_state->levels[RV770_SMC_PERFORMANCE_LEVELS_PER_SWSTATE - 1].aT =
+               cpu_to_be32(a_t);
+
+       return 0;
+}
+
+int rv770_populate_smc_sp(struct radeon_device *rdev,
+                         struct radeon_ps *radeon_state,
+                         RV770_SMC_SWSTATE *smc_state)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       int i;
+
+       for (i = 0; i < (RV770_SMC_PERFORMANCE_LEVELS_PER_SWSTATE - 1); i++)
+               smc_state->levels[i].bSP = cpu_to_be32(pi->dsp);
+
+       smc_state->levels[RV770_SMC_PERFORMANCE_LEVELS_PER_SWSTATE - 1].bSP =
+               cpu_to_be32(pi->psp);
+
+       return 0;
+}
+
+static void rv770_calculate_fractional_mpll_feedback_divider(u32 memory_clock,
+                                                            u32 
reference_clock,
+                                                            bool gddr5,
+                                                            struct 
atom_clock_dividers *dividers,
+                                                            u32 *clkf,
+                                                            u32 *clkfrac)
+{
+       u32 post_divider, reference_divider, feedback_divider8;
+       u32 fyclk;
+
+       if (gddr5)
+               fyclk = (memory_clock * 8) / 2;
+       else
+               fyclk = (memory_clock * 4) / 2;
+
+       post_divider = dividers->post_div;
+       reference_divider = dividers->ref_div;
+
+       feedback_divider8 =
+               (8 * fyclk * reference_divider * post_divider) / 
reference_clock;
+
+       *clkf = feedback_divider8 / 8;
+       *clkfrac = feedback_divider8 % 8;
+}
+
+static int rv770_encode_yclk_post_div(u32 postdiv, u32 *encoded_postdiv)
+{
+       int ret = 0;
+
+       switch (postdiv) {
+        case 1:
+               *encoded_postdiv = 0;
+               break;
+        case 2:
+               *encoded_postdiv = 1;
+               break;
+        case 4:
+               *encoded_postdiv = 2;
+               break;
+        case 8:
+               *encoded_postdiv = 3;
+               break;
+        case 16:
+               *encoded_postdiv = 4;
+               break;
+        default:
+               ret = -EINVAL;
+               break;
+       }
+
+    return ret;
+}
+
+u32 rv770_map_clkf_to_ibias(struct radeon_device *rdev, u32 clkf)
+{
+       if (clkf <= 0x10)
+               return 0x4B;
+       if (clkf <= 0x19)
+               return 0x5B;
+       if (clkf <= 0x21)
+               return 0x2B;
+       if (clkf <= 0x27)
+               return 0x6C;
+       if (clkf <= 0x31)
+               return 0x9D;
+       return 0xC6;
+}
+
+static int rv770_populate_mclk_value(struct radeon_device *rdev,
+                                    u32 engine_clock, u32 memory_clock,
+                                    RV7XX_SMC_MCLK_VALUE *mclk)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u8 encoded_reference_dividers[] = { 0, 16, 17, 20, 21 };
+       u32 mpll_ad_func_cntl =
+               pi->clk_regs.rv770.mpll_ad_func_cntl;
+       u32 mpll_ad_func_cntl_2 =
+               pi->clk_regs.rv770.mpll_ad_func_cntl_2;
+       u32 mpll_dq_func_cntl =
+               pi->clk_regs.rv770.mpll_dq_func_cntl;
+       u32 mpll_dq_func_cntl_2 =
+               pi->clk_regs.rv770.mpll_dq_func_cntl_2;
+       u32 mclk_pwrmgt_cntl =
+               pi->clk_regs.rv770.mclk_pwrmgt_cntl;
+       u32 dll_cntl = pi->clk_regs.rv770.dll_cntl;
+       struct atom_clock_dividers dividers;
+       u32 reference_clock = rdev->clock.mpll.reference_freq;
+       u32 clkf, clkfrac;
+       u32 postdiv_yclk;
+       u32 ibias;
+       int ret;
+
+       ret = radeon_atom_get_clock_dividers(rdev, COMPUTE_MEMORY_PLL_PARAM,
+                                            memory_clock, false, &dividers);
+       if (ret)
+               return ret;
+
+       if ((dividers.ref_div < 1) || (dividers.ref_div > 5))
+               return -EINVAL;
+
+       rv770_calculate_fractional_mpll_feedback_divider(memory_clock, 
reference_clock,
+                                                        pi->mem_gddr5,
+                                                        &dividers, &clkf, 
&clkfrac);
+
+       ret = rv770_encode_yclk_post_div(dividers.post_div, &postdiv_yclk);
+       if (ret)
+               return ret;
+
+       ibias = rv770_map_clkf_to_ibias(rdev, clkf);
+
+       mpll_ad_func_cntl &= ~(CLKR_MASK |
+                              YCLK_POST_DIV_MASK |
+                              CLKF_MASK |
+                              CLKFRAC_MASK |
+                              IBIAS_MASK);
+       mpll_ad_func_cntl |= CLKR(encoded_reference_dividers[dividers.ref_div - 
1]);
+       mpll_ad_func_cntl |= YCLK_POST_DIV(postdiv_yclk);
+       mpll_ad_func_cntl |= CLKF(clkf);
+       mpll_ad_func_cntl |= CLKFRAC(clkfrac);
+       mpll_ad_func_cntl |= IBIAS(ibias);
+
+       if (dividers.vco_mode)
+               mpll_ad_func_cntl_2 |= VCO_MODE;
+       else
+               mpll_ad_func_cntl_2 &= ~VCO_MODE;
+
+       if (pi->mem_gddr5) {
+               rv770_calculate_fractional_mpll_feedback_divider(memory_clock,
+                                                                
reference_clock,
+                                                                pi->mem_gddr5,
+                                                                &dividers, 
&clkf, &clkfrac);
+
+               ibias = rv770_map_clkf_to_ibias(rdev, clkf);
+
+               ret = rv770_encode_yclk_post_div(dividers.post_div, 
&postdiv_yclk);
+               if (ret)
+                       return ret;
+
+               mpll_dq_func_cntl &= ~(CLKR_MASK |
+                                      YCLK_POST_DIV_MASK |
+                                      CLKF_MASK |
+                                      CLKFRAC_MASK |
+                                      IBIAS_MASK);
+               mpll_dq_func_cntl |= 
CLKR(encoded_reference_dividers[dividers.ref_div - 1]);
+               mpll_dq_func_cntl |= YCLK_POST_DIV(postdiv_yclk);
+               mpll_dq_func_cntl |= CLKF(clkf);
+               mpll_dq_func_cntl |= CLKFRAC(clkfrac);
+               mpll_dq_func_cntl |= IBIAS(ibias);
+
+               if (dividers.vco_mode)
+                       mpll_dq_func_cntl_2 |= VCO_MODE;
+               else
+                       mpll_dq_func_cntl_2 &= ~VCO_MODE;
+       }
+
+       mclk->mclk770.mclk_value = cpu_to_be32(memory_clock);
+       mclk->mclk770.vMPLL_AD_FUNC_CNTL = cpu_to_be32(mpll_ad_func_cntl);
+       mclk->mclk770.vMPLL_AD_FUNC_CNTL_2 = cpu_to_be32(mpll_ad_func_cntl_2);
+       mclk->mclk770.vMPLL_DQ_FUNC_CNTL = cpu_to_be32(mpll_dq_func_cntl);
+       mclk->mclk770.vMPLL_DQ_FUNC_CNTL_2 = cpu_to_be32(mpll_dq_func_cntl_2);
+       mclk->mclk770.vMCLK_PWRMGT_CNTL = cpu_to_be32(mclk_pwrmgt_cntl);
+       mclk->mclk770.vDLL_CNTL = cpu_to_be32(dll_cntl);
+
+       return 0;
+}
+
+static int rv770_populate_sclk_value(struct radeon_device *rdev,
+                                    u32 engine_clock,
+                                    RV770_SMC_SCLK_VALUE *sclk)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       struct atom_clock_dividers dividers;
+       u32 spll_func_cntl =
+               pi->clk_regs.rv770.cg_spll_func_cntl;
+       u32 spll_func_cntl_2 =
+               pi->clk_regs.rv770.cg_spll_func_cntl_2;
+       u32 spll_func_cntl_3 =
+               pi->clk_regs.rv770.cg_spll_func_cntl_3;
+       u32 cg_spll_spread_spectrum =
+               pi->clk_regs.rv770.cg_spll_spread_spectrum;
+       u32 cg_spll_spread_spectrum_2 =
+               pi->clk_regs.rv770.cg_spll_spread_spectrum_2;
+       u64 tmp;
+       u32 reference_clock = rdev->clock.spll.reference_freq;
+       u32 reference_divider, post_divider;
+       u32 fbdiv;
+       int ret;
+
+       ret = radeon_atom_get_clock_dividers(rdev, COMPUTE_ENGINE_PLL_PARAM,
+                                            engine_clock, false, &dividers);
+       if (ret)
+               return ret;
+
+       reference_divider = 1 + dividers.ref_div;
+
+       if (dividers.enable_post_div)
+               post_divider = (0x0f & (dividers.post_div >> 4)) + (0x0f & 
dividers.post_div) + 2;
+       else
+               post_divider = 1;
+
+       tmp = (u64) engine_clock * reference_divider * post_divider;
+
+       fbdiv = (u32) ((16384 * tmp) / reference_clock);
+
+       if (dividers.enable_post_div)
+               spll_func_cntl |= SPLL_DIVEN;
+       else
+               spll_func_cntl &= ~SPLL_DIVEN;
+       spll_func_cntl &= ~(SPLL_HILEN_MASK | SPLL_LOLEN_MASK | 
SPLL_REF_DIV_MASK);
+       spll_func_cntl |= SPLL_REF_DIV(dividers.ref_div);
+       spll_func_cntl |= SPLL_HILEN((dividers.post_div >> 4) & 0xf);
+       spll_func_cntl |= SPLL_LOLEN(dividers.post_div & 0xf);
+
+       spll_func_cntl_2 &= ~SCLK_MUX_SEL_MASK;
+       spll_func_cntl_2 |= SCLK_MUX_SEL(2);
+
+       spll_func_cntl_3 &= ~SPLL_FB_DIV_MASK;
+       spll_func_cntl_3 |= SPLL_FB_DIV(fbdiv);
+       spll_func_cntl_3 |= SPLL_DITHEN;
+
+       if (pi->sclk_ss) {
+               struct radeon_atom_ss ss;
+               u32 vco_freq = engine_clock * post_divider;
+
+               if (radeon_atombios_get_asic_ss_info(rdev, &ss,
+                                                    ASIC_INTERNAL_ENGINE_SS, 
vco_freq)) {
+                       u32 clk_s = reference_clock * 5 / (reference_divider * 
ss.rate);
+                       u32 clk_v = ss.percentage * fbdiv / (clk_s * 10000);
+
+                       cg_spll_spread_spectrum &= ~CLKS_MASK;
+                       cg_spll_spread_spectrum |= CLKS(clk_s);
+                       cg_spll_spread_spectrum |= SSEN;
+
+                       cg_spll_spread_spectrum_2 &= ~CLKV_MASK;
+                       cg_spll_spread_spectrum_2 |= CLKV(clk_v);
+               }
+       }
+
+       sclk->sclk_value = cpu_to_be32(engine_clock);
+       sclk->vCG_SPLL_FUNC_CNTL = cpu_to_be32(spll_func_cntl);
+       sclk->vCG_SPLL_FUNC_CNTL_2 = cpu_to_be32(spll_func_cntl_2);
+       sclk->vCG_SPLL_FUNC_CNTL_3 = cpu_to_be32(spll_func_cntl_3);
+       sclk->vCG_SPLL_SPREAD_SPECTRUM = cpu_to_be32(cg_spll_spread_spectrum);
+       sclk->vCG_SPLL_SPREAD_SPECTRUM_2 = 
cpu_to_be32(cg_spll_spread_spectrum_2);
+
+       return 0;
+}
+
+int rv770_populate_vddc_value(struct radeon_device *rdev, u16 vddc,
+                             RV770_SMC_VOLTAGE_VALUE *voltage)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       int i;
+
+       if (!pi->voltage_control) {
+               voltage->index = 0;
+               voltage->value = 0;
+               return 0;
+       }
+
+       for (i = 0; i < pi->valid_vddc_entries; i++) {
+               if (vddc <= pi->vddc_table[i].vddc) {
+                       voltage->index = pi->vddc_table[i].vddc_index;
+                       voltage->value = cpu_to_be16(vddc);
+                       break;
+               }
+       }
+
+       if (i == pi->valid_vddc_entries)
+               return -EINVAL;
+
+       return 0;
+}
+
+int rv770_populate_mvdd_value(struct radeon_device *rdev, u32 mclk,
+                             RV770_SMC_VOLTAGE_VALUE *voltage)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       if (!pi->mvdd_control) {
+               voltage->index = MVDD_HIGH_INDEX;
+               voltage->value = cpu_to_be16(MVDD_HIGH_VALUE);
+               return 0;
+       }
+
+       if (mclk <= pi->mvdd_split_frequency) {
+               voltage->index = MVDD_LOW_INDEX;
+               voltage->value = cpu_to_be16(MVDD_LOW_VALUE);
+       } else {
+               voltage->index = MVDD_HIGH_INDEX;
+               voltage->value = cpu_to_be16(MVDD_HIGH_VALUE);
+       }
+
+       return 0;
+}
+
+static int rv770_convert_power_level_to_smc(struct radeon_device *rdev,
+                                           struct rv7xx_pl *pl,
+                                           RV770_SMC_HW_PERFORMANCE_LEVEL 
*level,
+                                           u8 watermark_level)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       int ret;
+
+       level->gen2PCIE = pi->pcie_gen2 ?
+               ((pl->flags & ATOM_PPLIB_R600_FLAGS_PCIEGEN2) ? 1 : 0) : 0;
+       level->gen2XSP  = (pl->flags & ATOM_PPLIB_R600_FLAGS_PCIEGEN2) ? 1 : 0;
+       level->backbias = (pl->flags & ATOM_PPLIB_R600_FLAGS_BACKBIASENABLE) ? 
1 : 0;
+       level->displayWatermark = watermark_level;
+
+       if (rdev->family == CHIP_RV740)
+               ret = rv740_populate_sclk_value(rdev, pl->sclk,
+                                               &level->sclk);
+       else if ((rdev->family == CHIP_RV730) || (rdev->family == CHIP_RV710))
+               ret = rv730_populate_sclk_value(rdev, pl->sclk,
+                                               &level->sclk);
+       else
+               ret = rv770_populate_sclk_value(rdev, pl->sclk,
+                                               &level->sclk);
+       if (ret)
+               return ret;
+
+       if (rdev->family == CHIP_RV740) {
+               if (pi->mem_gddr5) {
+                       if (pl->mclk <= pi->mclk_strobe_mode_threshold)
+                               level->strobeMode =
+                                       
rv740_get_mclk_frequency_ratio(pl->mclk) | 0x10;
+                       else
+                               level->strobeMode = 0;
+
+                       if (pl->mclk > pi->mclk_edc_enable_threshold)
+                               level->mcFlags = SMC_MC_EDC_RD_FLAG | 
SMC_MC_EDC_WR_FLAG;
+                       else
+                               level->mcFlags =  0;
+               }
+               ret = rv740_populate_mclk_value(rdev, pl->sclk,
+                                               pl->mclk, &level->mclk);
+       } else if ((rdev->family == CHIP_RV730) || (rdev->family == CHIP_RV710))
+               ret = rv730_populate_mclk_value(rdev, pl->sclk,
+                                               pl->mclk, &level->mclk);
+       else
+               ret = rv770_populate_mclk_value(rdev, pl->sclk,
+                                               pl->mclk, &level->mclk);
+       if (ret)
+               return ret;
+
+       ret = rv770_populate_vddc_value(rdev, pl->vddc,
+                                       &level->vddc);
+       if (ret)
+               return ret;
+
+       ret = rv770_populate_mvdd_value(rdev, pl->mclk, &level->mvdd);
+
+       return ret;
+}
+
+static int rv770_convert_power_state_to_smc(struct radeon_device *rdev,
+                                           struct radeon_ps *radeon_state,
+                                           RV770_SMC_SWSTATE *smc_state)
+{
+       struct rv7xx_ps *state = rv770_get_ps(radeon_state);
+       int ret;
+
+       if (!(radeon_state->caps & ATOM_PPLIB_DISALLOW_ON_DC))
+               smc_state->flags |= PPSMC_SWSTATE_FLAG_DC;
+
+       ret = rv770_convert_power_level_to_smc(rdev,
+                                              &state->low,
+                                              &smc_state->levels[0],
+                                              PPSMC_DISPLAY_WATERMARK_LOW);
+       if (ret)
+               return ret;
+
+       ret = rv770_convert_power_level_to_smc(rdev,
+                                              &state->medium,
+                                              &smc_state->levels[1],
+                                              PPSMC_DISPLAY_WATERMARK_LOW);
+       if (ret)
+               return ret;
+
+       ret = rv770_convert_power_level_to_smc(rdev,
+                                              &state->high,
+                                              &smc_state->levels[2],
+                                              PPSMC_DISPLAY_WATERMARK_HIGH);
+       if (ret)
+               return ret;
+
+       smc_state->levels[0].arbValue = MC_CG_ARB_FREQ_F1;
+       smc_state->levels[1].arbValue = MC_CG_ARB_FREQ_F2;
+       smc_state->levels[2].arbValue = MC_CG_ARB_FREQ_F3;
+
+       smc_state->levels[0].seqValue = rv770_get_seq_value(rdev,
+                                                           &state->low);
+       smc_state->levels[1].seqValue = rv770_get_seq_value(rdev,
+                                                           &state->medium);
+       smc_state->levels[2].seqValue = rv770_get_seq_value(rdev,
+                                                           &state->high);
+
+       rv770_populate_smc_sp(rdev, radeon_state, smc_state);
+
+       return rv770_populate_smc_t(rdev, radeon_state, smc_state);
+
+}
+
+u32 rv770_calculate_memory_refresh_rate(struct radeon_device *rdev,
+                                       u32 engine_clock)
+{
+       u32 dram_rows;
+       u32 dram_refresh_rate;
+       u32 mc_arb_rfsh_rate;
+       u32 tmp;
+
+       tmp = (RREG32(MC_ARB_RAMCFG) & NOOFROWS_MASK) >> NOOFROWS_SHIFT;
+       dram_rows = 1 << (tmp + 10);
+       tmp = RREG32(MC_SEQ_MISC0) & 3;
+       dram_refresh_rate = 1 << (tmp + 3);
+       mc_arb_rfsh_rate = ((engine_clock * 10) * dram_refresh_rate / dram_rows 
- 32) / 64;
+
+       return mc_arb_rfsh_rate;
+}
+
+static void rv770_program_memory_timing_parameters(struct radeon_device *rdev,
+                                                  struct radeon_ps 
*radeon_state)
+{
+       struct rv7xx_ps *state = rv770_get_ps(radeon_state);
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u32 sqm_ratio;
+       u32 arb_refresh_rate;
+       u32 high_clock;
+
+       if (state->high.sclk < (state->low.sclk * 0xFF / 0x40))
+               high_clock = state->high.sclk;
+       else
+               high_clock = (state->low.sclk * 0xFF / 0x40);
+
+       radeon_atom_set_engine_dram_timings(rdev, high_clock,
+                                           state->high.mclk);
+
+       sqm_ratio =
+               STATE0(64 * high_clock / pi->boot_sclk) |
+               STATE1(64 * high_clock / state->low.sclk) |
+               STATE2(64 * high_clock / state->medium.sclk) |
+               STATE3(64 * high_clock / state->high.sclk);
+       WREG32(MC_ARB_SQM_RATIO, sqm_ratio);
+
+       arb_refresh_rate =
+               POWERMODE0(rv770_calculate_memory_refresh_rate(rdev, 
pi->boot_sclk)) |
+               POWERMODE1(rv770_calculate_memory_refresh_rate(rdev, 
state->low.sclk)) |
+               POWERMODE2(rv770_calculate_memory_refresh_rate(rdev, 
state->medium.sclk)) |
+               POWERMODE3(rv770_calculate_memory_refresh_rate(rdev, 
state->high.sclk));
+       WREG32(MC_ARB_RFSH_RATE, arb_refresh_rate);
+}
+
+void rv770_enable_backbias(struct radeon_device *rdev,
+                          bool enable)
+{
+       if (enable)
+               WREG32_P(GENERAL_PWRMGT, BACKBIAS_PAD_EN, ~BACKBIAS_PAD_EN);
+       else
+               WREG32_P(GENERAL_PWRMGT, 0, ~(BACKBIAS_VALUE | 
BACKBIAS_PAD_EN));
+}
+
+static void rv770_enable_spread_spectrum(struct radeon_device *rdev,
+                                        bool enable)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       if (enable) {
+               if (pi->sclk_ss)
+                       WREG32_P(GENERAL_PWRMGT, DYN_SPREAD_SPECTRUM_EN, 
~DYN_SPREAD_SPECTRUM_EN);
+
+               if (pi->mclk_ss) {
+                       if (rdev->family == CHIP_RV740)
+                               rv740_enable_mclk_spread_spectrum(rdev, true);
+               }
+       } else {
+               WREG32_P(CG_SPLL_SPREAD_SPECTRUM, 0, ~SSEN);
+
+               WREG32_P(GENERAL_PWRMGT, 0, ~DYN_SPREAD_SPECTRUM_EN);
+
+               WREG32_P(CG_MPLL_SPREAD_SPECTRUM, 0, ~SSEN);
+
+               if (rdev->family == CHIP_RV740)
+                       rv740_enable_mclk_spread_spectrum(rdev, false);
+       }
+}
+
+static void rv770_program_mpll_timing_parameters(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       if ((rdev->family == CHIP_RV770) && !pi->mem_gddr5) {
+               WREG32(MPLL_TIME,
+                      (MPLL_LOCK_TIME(R600_MPLLLOCKTIME_DFLT * pi->ref_div) |
+                       MPLL_RESET_TIME(R600_MPLLRESETTIME_DFLT)));
+       }
+}
+
+void rv770_setup_bsp(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u32 xclk = radeon_get_xclk(rdev);
+
+       r600_calculate_u_and_p(pi->asi,
+                              xclk,
+                              16,
+                              &pi->bsp,
+                              &pi->bsu);
+
+       r600_calculate_u_and_p(pi->pasi,
+                              xclk,
+                              16,
+                              &pi->pbsp,
+                              &pi->pbsu);
+
+       pi->dsp = BSP(pi->bsp) | BSU(pi->bsu);
+       pi->psp = BSP(pi->pbsp) | BSU(pi->pbsu);
+
+       WREG32(CG_BSP, pi->dsp);
+
+}
+
+void rv770_program_git(struct radeon_device *rdev)
+{
+       WREG32_P(CG_GIT, CG_GICST(R600_GICST_DFLT), ~CG_GICST_MASK);
+}
+
+void rv770_program_tp(struct radeon_device *rdev)
+{
+       int i;
+       enum r600_td td = R600_TD_DFLT;
+
+       for (i = 0; i < R600_PM_NUMBER_OF_TC; i++)
+               WREG32(CG_FFCT_0 + (i * 4), (UTC_0(r600_utc[i]) | 
DTC_0(r600_dtc[i])));
+
+       if (td == R600_TD_AUTO)
+               WREG32_P(SCLK_PWRMGT_CNTL, 0, ~FIR_FORCE_TREND_SEL);
+       else
+               WREG32_P(SCLK_PWRMGT_CNTL, FIR_FORCE_TREND_SEL, 
~FIR_FORCE_TREND_SEL);
+       if (td == R600_TD_UP)
+               WREG32_P(SCLK_PWRMGT_CNTL, 0, ~FIR_TREND_MODE);
+       if (td == R600_TD_DOWN)
+               WREG32_P(SCLK_PWRMGT_CNTL, FIR_TREND_MODE, ~FIR_TREND_MODE);
+}
+
+void rv770_program_tpp(struct radeon_device *rdev)
+{
+       WREG32(CG_TPC, R600_TPC_DFLT);
+}
+
+void rv770_program_sstp(struct radeon_device *rdev)
+{
+       WREG32(CG_SSP, (SSTU(R600_SSTU_DFLT) | SST(R600_SST_DFLT)));
+}
+
+void rv770_program_engine_speed_parameters(struct radeon_device *rdev)
+{
+       WREG32_P(SPLL_CNTL_MODE, SPLL_DIV_SYNC, ~SPLL_DIV_SYNC);
+}
+
+static void rv770_enable_display_gap(struct radeon_device *rdev)
+{
+       u32 tmp = RREG32(CG_DISPLAY_GAP_CNTL);
+
+       tmp &= ~(DISP1_GAP_MCHG_MASK | DISP2_GAP_MCHG_MASK);
+       tmp |= (DISP1_GAP_MCHG(R600_PM_DISPLAY_GAP_IGNORE) |
+               DISP2_GAP_MCHG(R600_PM_DISPLAY_GAP_IGNORE));
+       WREG32(CG_DISPLAY_GAP_CNTL, tmp);
+}
+
+void rv770_program_vc(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       WREG32(CG_FTV, pi->vrc);
+}
+
+void rv770_clear_vc(struct radeon_device *rdev)
+{
+       WREG32(CG_FTV, 0);
+}
+
+int rv770_upload_firmware(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       int ret;
+
+       rv770_reset_smc(rdev);
+       rv770_stop_smc_clock(rdev);
+
+       ret = rv770_load_smc_ucode(rdev, pi->sram_end);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+static int rv770_populate_smc_acpi_state(struct radeon_device *rdev,
+                                        RV770_SMC_STATETABLE *table)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       u32 mpll_ad_func_cntl =
+               pi->clk_regs.rv770.mpll_ad_func_cntl;
+       u32 mpll_ad_func_cntl_2 =
+               pi->clk_regs.rv770.mpll_ad_func_cntl_2;
+       u32 mpll_dq_func_cntl =
+               pi->clk_regs.rv770.mpll_dq_func_cntl;
+       u32 mpll_dq_func_cntl_2 =
+               pi->clk_regs.rv770.mpll_dq_func_cntl_2;
+       u32 spll_func_cntl =
+               pi->clk_regs.rv770.cg_spll_func_cntl;
+       u32 spll_func_cntl_2 =
+               pi->clk_regs.rv770.cg_spll_func_cntl_2;
+       u32 spll_func_cntl_3 =
+               pi->clk_regs.rv770.cg_spll_func_cntl_3;
+       u32 mclk_pwrmgt_cntl;
+       u32 dll_cntl;
+
+       table->ACPIState = table->initialState;
+
+       table->ACPIState.flags &= ~PPSMC_SWSTATE_FLAG_DC;
+
+       if (pi->acpi_vddc) {
+               rv770_populate_vddc_value(rdev, pi->acpi_vddc,
+                                         &table->ACPIState.levels[0].vddc);
+               if (pi->pcie_gen2) {
+                       if (pi->acpi_pcie_gen2)
+                               table->ACPIState.levels[0].gen2PCIE = 1;
+                       else
+                               table->ACPIState.levels[0].gen2PCIE = 0;
+               } else
+                       table->ACPIState.levels[0].gen2PCIE = 0;
+               if (pi->acpi_pcie_gen2)
+                       table->ACPIState.levels[0].gen2XSP = 1;
+               else
+                       table->ACPIState.levels[0].gen2XSP = 0;
+       } else {
+               rv770_populate_vddc_value(rdev, pi->min_vddc_in_table,
+                                         &table->ACPIState.levels[0].vddc);
+               table->ACPIState.levels[0].gen2PCIE = 0;
+       }
+
+
+       mpll_ad_func_cntl_2 |= BIAS_GEN_PDNB | RESET_EN;
+
+       mpll_dq_func_cntl_2 |= BIAS_GEN_PDNB | RESET_EN;
+
+       mclk_pwrmgt_cntl = (MRDCKA0_RESET |
+                           MRDCKA1_RESET |
+                           MRDCKB0_RESET |
+                           MRDCKB1_RESET |
+                           MRDCKC0_RESET |
+                           MRDCKC1_RESET |
+                           MRDCKD0_RESET |
+                           MRDCKD1_RESET);
+
+       dll_cntl = 0xff000000;
+
+       spll_func_cntl |= SPLL_RESET | SPLL_SLEEP | SPLL_BYPASS_EN;
+
+       spll_func_cntl_2 &= ~SCLK_MUX_SEL_MASK;
+       spll_func_cntl_2 |= SCLK_MUX_SEL(4);
+
+       table->ACPIState.levels[0].mclk.mclk770.vMPLL_AD_FUNC_CNTL = 
cpu_to_be32(mpll_ad_func_cntl);
+       table->ACPIState.levels[0].mclk.mclk770.vMPLL_AD_FUNC_CNTL_2 = 
cpu_to_be32(mpll_ad_func_cntl_2);
+       table->ACPIState.levels[0].mclk.mclk770.vMPLL_DQ_FUNC_CNTL = 
cpu_to_be32(mpll_dq_func_cntl);
+       table->ACPIState.levels[0].mclk.mclk770.vMPLL_DQ_FUNC_CNTL_2 = 
cpu_to_be32(mpll_dq_func_cntl_2);
+
+       table->ACPIState.levels[0].mclk.mclk770.vMCLK_PWRMGT_CNTL = 
cpu_to_be32(mclk_pwrmgt_cntl);
+       table->ACPIState.levels[0].mclk.mclk770.vDLL_CNTL = 
cpu_to_be32(dll_cntl);
+
+       table->ACPIState.levels[0].mclk.mclk770.mclk_value = 0;
+
+       table->ACPIState.levels[0].sclk.vCG_SPLL_FUNC_CNTL = 
cpu_to_be32(spll_func_cntl);
+       table->ACPIState.levels[0].sclk.vCG_SPLL_FUNC_CNTL_2 = 
cpu_to_be32(spll_func_cntl_2);
+       table->ACPIState.levels[0].sclk.vCG_SPLL_FUNC_CNTL_3 = 
cpu_to_be32(spll_func_cntl_3);
+
+       table->ACPIState.levels[0].sclk.sclk_value = 0;
+
+       rv770_populate_mvdd_value(rdev, 0, &table->ACPIState.levels[0].mvdd);
+
+       table->ACPIState.levels[1] = table->ACPIState.levels[0];
+       table->ACPIState.levels[2] = table->ACPIState.levels[0];
+
+       return 0;
+}
+
+int rv770_populate_initial_mvdd_value(struct radeon_device *rdev,
+                                     RV770_SMC_VOLTAGE_VALUE *voltage)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       if ((pi->s0_vid_lower_smio_cntl & pi->mvdd_mask_low) ==
+            (pi->mvdd_low_smio[MVDD_LOW_INDEX] & pi->mvdd_mask_low) ) {
+               voltage->index = MVDD_LOW_INDEX;
+               voltage->value = cpu_to_be16(MVDD_LOW_VALUE);
+       } else {
+               voltage->index = MVDD_HIGH_INDEX;
+               voltage->value = cpu_to_be16(MVDD_HIGH_VALUE);
+       }
+
+       return 0;
+}
+
+static int rv770_populate_smc_initial_state(struct radeon_device *rdev,
+                                           struct radeon_ps *radeon_state,
+                                           RV770_SMC_STATETABLE *table)
+{
+       struct rv7xx_ps *initial_state = rv770_get_ps(radeon_state);
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u32 a_t;
+
+       table->initialState.levels[0].mclk.mclk770.vMPLL_AD_FUNC_CNTL =
+               cpu_to_be32(pi->clk_regs.rv770.mpll_ad_func_cntl);
+       table->initialState.levels[0].mclk.mclk770.vMPLL_AD_FUNC_CNTL_2 =
+               cpu_to_be32(pi->clk_regs.rv770.mpll_ad_func_cntl_2);
+       table->initialState.levels[0].mclk.mclk770.vMPLL_DQ_FUNC_CNTL =
+               cpu_to_be32(pi->clk_regs.rv770.mpll_dq_func_cntl);
+       table->initialState.levels[0].mclk.mclk770.vMPLL_DQ_FUNC_CNTL_2 =
+               cpu_to_be32(pi->clk_regs.rv770.mpll_dq_func_cntl_2);
+       table->initialState.levels[0].mclk.mclk770.vMCLK_PWRMGT_CNTL =
+               cpu_to_be32(pi->clk_regs.rv770.mclk_pwrmgt_cntl);
+       table->initialState.levels[0].mclk.mclk770.vDLL_CNTL =
+               cpu_to_be32(pi->clk_regs.rv770.dll_cntl);
+
+       table->initialState.levels[0].mclk.mclk770.vMPLL_SS =
+               cpu_to_be32(pi->clk_regs.rv770.mpll_ss1);
+       table->initialState.levels[0].mclk.mclk770.vMPLL_SS2 =
+               cpu_to_be32(pi->clk_regs.rv770.mpll_ss2);
+
+       table->initialState.levels[0].mclk.mclk770.mclk_value =
+               cpu_to_be32(initial_state->low.mclk);
+
+       table->initialState.levels[0].sclk.vCG_SPLL_FUNC_CNTL =
+               cpu_to_be32(pi->clk_regs.rv770.cg_spll_func_cntl);
+       table->initialState.levels[0].sclk.vCG_SPLL_FUNC_CNTL_2 =
+               cpu_to_be32(pi->clk_regs.rv770.cg_spll_func_cntl_2);
+       table->initialState.levels[0].sclk.vCG_SPLL_FUNC_CNTL_3 =
+               cpu_to_be32(pi->clk_regs.rv770.cg_spll_func_cntl_3);
+       table->initialState.levels[0].sclk.vCG_SPLL_SPREAD_SPECTRUM =
+               cpu_to_be32(pi->clk_regs.rv770.cg_spll_spread_spectrum);
+       table->initialState.levels[0].sclk.vCG_SPLL_SPREAD_SPECTRUM_2 =
+               cpu_to_be32(pi->clk_regs.rv770.cg_spll_spread_spectrum_2);
+
+       table->initialState.levels[0].sclk.sclk_value =
+               cpu_to_be32(initial_state->low.sclk);
+
+       table->initialState.levels[0].arbValue = MC_CG_ARB_FREQ_F0;
+
+       table->initialState.levels[0].seqValue =
+               rv770_get_seq_value(rdev, &initial_state->low);
+
+       rv770_populate_vddc_value(rdev,
+                                 initial_state->low.vddc,
+                                 &table->initialState.levels[0].vddc);
+       rv770_populate_initial_mvdd_value(rdev,
+                                         &table->initialState.levels[0].mvdd);
+
+       a_t = CG_R(0xffff) | CG_L(0);
+       table->initialState.levels[0].aT = cpu_to_be32(a_t);
+
+       table->initialState.levels[0].bSP = cpu_to_be32(pi->dsp);
+
+       if (pi->boot_in_gen2)
+               table->initialState.levels[0].gen2PCIE = 1;
+       else
+               table->initialState.levels[0].gen2PCIE = 0;
+       if (initial_state->low.flags & ATOM_PPLIB_R600_FLAGS_PCIEGEN2)
+               table->initialState.levels[0].gen2XSP = 1;
+       else
+               table->initialState.levels[0].gen2XSP = 0;
+
+       if (rdev->family == CHIP_RV740) {
+               if (pi->mem_gddr5) {
+                       if (initial_state->low.mclk <= 
pi->mclk_strobe_mode_threshold)
+                               table->initialState.levels[0].strobeMode =
+                                       
rv740_get_mclk_frequency_ratio(initial_state->low.mclk) | 0x10;
+                       else
+                               table->initialState.levels[0].strobeMode = 0;
+
+                       if (initial_state->low.mclk >= 
pi->mclk_edc_enable_threshold)
+                               table->initialState.levels[0].mcFlags = 
SMC_MC_EDC_RD_FLAG | SMC_MC_EDC_WR_FLAG;
+                       else
+                               table->initialState.levels[0].mcFlags =  0;
+               }
+       }
+
+       table->initialState.levels[1] = table->initialState.levels[0];
+       table->initialState.levels[2] = table->initialState.levels[0];
+
+       table->initialState.flags |= PPSMC_SWSTATE_FLAG_DC;
+
+       return 0;
+}
+
+static int rv770_populate_smc_vddc_table(struct radeon_device *rdev,
+                                        RV770_SMC_STATETABLE *table)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       int i;
+
+       for (i = 0; i < pi->valid_vddc_entries; i++) {
+               table->highSMIO[pi->vddc_table[i].vddc_index] =
+                       pi->vddc_table[i].high_smio;
+               table->lowSMIO[pi->vddc_table[i].vddc_index] =
+                       cpu_to_be32(pi->vddc_table[i].low_smio);
+       }
+
+       table->voltageMaskTable.highMask[RV770_SMC_VOLTAGEMASK_VDDC] = 0;
+       table->voltageMaskTable.lowMask[RV770_SMC_VOLTAGEMASK_VDDC] =
+               cpu_to_be32(pi->vddc_mask_low);
+
+       for (i = 0;
+            ((i < pi->valid_vddc_entries) &&
+             (pi->max_vddc_in_table >
+              pi->vddc_table[i].vddc));
+            i++);
+
+       table->maxVDDCIndexInPPTable =
+               pi->vddc_table[i].vddc_index;
+
+       return 0;
+}
+
+static int rv770_populate_smc_mvdd_table(struct radeon_device *rdev,
+                                        RV770_SMC_STATETABLE *table)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       if (pi->mvdd_control) {
+               table->lowSMIO[MVDD_HIGH_INDEX] |=
+                       cpu_to_be32(pi->mvdd_low_smio[MVDD_HIGH_INDEX]);
+               table->lowSMIO[MVDD_LOW_INDEX] |=
+                       cpu_to_be32(pi->mvdd_low_smio[MVDD_LOW_INDEX]);
+
+               table->voltageMaskTable.highMask[RV770_SMC_VOLTAGEMASK_MVDD] = 
0;
+               table->voltageMaskTable.lowMask[RV770_SMC_VOLTAGEMASK_MVDD] =
+                       cpu_to_be32(pi->mvdd_mask_low);
+       }
+
+       return 0;
+}
+
+static int rv770_init_smc_table(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       struct radeon_ps *radeon_boot_state = rdev->pm.dpm.boot_ps;
+       struct rv7xx_ps *boot_state = rv770_get_ps(radeon_boot_state);
+       RV770_SMC_STATETABLE *table = &pi->smc_statetable;
+       int ret;
+
+       memset(table, 0, sizeof(RV770_SMC_STATETABLE));
+
+       pi->boot_sclk = boot_state->low.sclk;
+
+       rv770_populate_smc_vddc_table(rdev, table);
+       rv770_populate_smc_mvdd_table(rdev, table);
+
+       switch (rdev->pm.int_thermal_type) {
+        case THERMAL_TYPE_RV770:
+        case THERMAL_TYPE_ADT7473_WITH_INTERNAL:
+               table->thermalProtectType = PPSMC_THERMAL_PROTECT_TYPE_INTERNAL;
+               break;
+        case THERMAL_TYPE_NONE:
+               table->thermalProtectType = PPSMC_THERMAL_PROTECT_TYPE_NONE;
+               break;
+        case THERMAL_TYPE_EXTERNAL_GPIO:
+        default:
+               table->thermalProtectType = PPSMC_THERMAL_PROTECT_TYPE_EXTERNAL;
+               break;
+       }
+
+       if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_HARDWAREDC) {
+               table->systemFlags |= PPSMC_SYSTEMFLAG_GPIO_DC;
+
+               if (rdev->pm.dpm.platform_caps & 
ATOM_PP_PLATFORM_CAP_DONT_WAIT_FOR_VBLANK_ON_ALERT)
+                       table->extraFlags |= 
PPSMC_EXTRAFLAGS_AC2DC_DONT_WAIT_FOR_VBLANK;
+
+               if (rdev->pm.dpm.platform_caps & 
ATOM_PP_PLATFORM_CAP_GOTO_BOOT_ON_ALERT)
+                       table->extraFlags |= 
PPSMC_EXTRAFLAGS_AC2DC_ACTION_GOTOINITIALSTATE;
+       }
+
+       if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_STEPVDDC)
+               table->systemFlags |= PPSMC_SYSTEMFLAG_STEPVDDC;
+
+       if (pi->mem_gddr5)
+               table->systemFlags |= PPSMC_SYSTEMFLAG_GDDR5;
+
+       if ((rdev->family == CHIP_RV730) || (rdev->family == CHIP_RV710))
+               ret = rv730_populate_smc_initial_state(rdev, radeon_boot_state, 
table);
+       else
+               ret = rv770_populate_smc_initial_state(rdev, radeon_boot_state, 
table);
+       if (ret)
+               return ret;
+
+       if (rdev->family == CHIP_RV740)
+               ret = rv740_populate_smc_acpi_state(rdev, table);
+       else if ((rdev->family == CHIP_RV730) || (rdev->family == CHIP_RV710))
+               ret = rv730_populate_smc_acpi_state(rdev, table);
+       else
+               ret = rv770_populate_smc_acpi_state(rdev, table);
+       if (ret)
+               return ret;
+
+       table->driverState = table->initialState;
+
+       return rv770_copy_bytes_to_smc(rdev,
+                                      pi->state_table_start,
+                                      (const u8 *)table,
+                                      sizeof(RV770_SMC_STATETABLE),
+                                      pi->sram_end);
+}
+
+static int rv770_construct_vddc_table(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u16 min, max, step;
+       u32 steps = 0;
+       u8 vddc_index = 0;
+       u32 i;
+
+       radeon_atom_get_min_voltage(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC, &min);
+       radeon_atom_get_max_voltage(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC, &max);
+       radeon_atom_get_voltage_step(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC, &step);
+
+       steps = (max - min) / step + 1;
+
+       if (steps > MAX_NO_VREG_STEPS)
+               return -EINVAL;
+
+       for (i = 0; i < steps; i++) {
+               u32 gpio_pins, gpio_mask;
+
+               pi->vddc_table[i].vddc = (u16)(min + i * step);
+               radeon_atom_get_voltage_gpio_settings(rdev,
+                                                     pi->vddc_table[i].vddc,
+                                                     
SET_VOLTAGE_TYPE_ASIC_VDDC,
+                                                     &gpio_pins, &gpio_mask);
+               pi->vddc_table[i].low_smio = gpio_pins & gpio_mask;
+               pi->vddc_table[i].high_smio = 0;
+               pi->vddc_mask_low = gpio_mask;
+               if (i > 0) {
+                       if ((pi->vddc_table[i].low_smio !=
+                            pi->vddc_table[i - 1].low_smio ) ||
+                            (pi->vddc_table[i].high_smio !=
+                             pi->vddc_table[i - 1].high_smio))
+                               vddc_index++;
+               }
+               pi->vddc_table[i].vddc_index = vddc_index;
+       }
+
+       pi->valid_vddc_entries = (u8)steps;
+
+       return 0;
+}
+
+static u32 rv770_get_mclk_split_point(struct atom_memory_info *memory_info)
+{
+       if (memory_info->mem_type == MEM_TYPE_GDDR3)
+               return 30000;
+
+       return 0;
+}
+
+static int rv770_get_mvdd_pin_configuration(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u32 gpio_pins, gpio_mask;
+
+       radeon_atom_get_voltage_gpio_settings(rdev,
+                                             MVDD_HIGH_VALUE, 
SET_VOLTAGE_TYPE_ASIC_MVDDC,
+                                             &gpio_pins, &gpio_mask);
+       pi->mvdd_mask_low = gpio_mask;
+       pi->mvdd_low_smio[MVDD_HIGH_INDEX] =
+               gpio_pins & gpio_mask;
+
+       radeon_atom_get_voltage_gpio_settings(rdev,
+                                             MVDD_LOW_VALUE, 
SET_VOLTAGE_TYPE_ASIC_MVDDC,
+                                             &gpio_pins, &gpio_mask);
+       pi->mvdd_low_smio[MVDD_LOW_INDEX] =
+               gpio_pins & gpio_mask;
+
+       return 0;
+}
+
+u8 rv770_get_memory_module_index(struct radeon_device *rdev)
+{
+       return (u8) ((RREG32(BIOS_SCRATCH_4) >> 16) & 0xff);
+}
+
+static int rv770_get_mvdd_configuration(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u8 memory_module_index;
+       struct atom_memory_info memory_info;
+
+       memory_module_index = rv770_get_memory_module_index(rdev);
+
+       if (radeon_atom_get_memory_info(rdev, memory_module_index, 
&memory_info)) {
+               pi->mvdd_control = false;
+               return 0;
+       }
+
+       pi->mvdd_split_frequency =
+               rv770_get_mclk_split_point(&memory_info);
+
+       if (pi->mvdd_split_frequency == 0) {
+               pi->mvdd_control = false;
+               return 0;
+       }
+
+       return rv770_get_mvdd_pin_configuration(rdev);
+}
+
+void rv770_enable_voltage_control(struct radeon_device *rdev,
+                                 bool enable)
+{
+       if (enable)
+               WREG32_P(GENERAL_PWRMGT, VOLT_PWRMGT_EN, ~VOLT_PWRMGT_EN);
+       else
+               WREG32_P(GENERAL_PWRMGT, 0, ~VOLT_PWRMGT_EN);
+}
+
+static void rv770_program_display_gap(struct radeon_device *rdev)
+{
+       u32 tmp = RREG32(CG_DISPLAY_GAP_CNTL);
+
+       tmp &= ~(DISP1_GAP_MCHG_MASK | DISP2_GAP_MCHG_MASK);
+       if (RREG32(AVIVO_D1CRTC_CONTROL) & AVIVO_CRTC_EN) {
+               tmp |= DISP1_GAP_MCHG(R600_PM_DISPLAY_GAP_VBLANK);
+               tmp |= DISP2_GAP_MCHG(R600_PM_DISPLAY_GAP_IGNORE);
+       } else if (RREG32(AVIVO_D2CRTC_CONTROL) & AVIVO_CRTC_EN) {
+               tmp |= DISP1_GAP_MCHG(R600_PM_DISPLAY_GAP_IGNORE);
+               tmp |= DISP2_GAP_MCHG(R600_PM_DISPLAY_GAP_VBLANK);
+       } else {
+               tmp |= DISP1_GAP_MCHG(R600_PM_DISPLAY_GAP_IGNORE);
+               tmp |= DISP2_GAP_MCHG(R600_PM_DISPLAY_GAP_IGNORE);
+       }
+       WREG32(CG_DISPLAY_GAP_CNTL, tmp);
+}
+
+static void rv770_enable_dynamic_pcie_gen2(struct radeon_device *rdev,
+                                          bool enable)
+{
+       rv770_enable_bif_dynamic_pcie_gen2(rdev, enable);
+
+       if (enable)
+               WREG32_P(GENERAL_PWRMGT, ENABLE_GEN2PCIE, ~ENABLE_GEN2PCIE);
+       else
+               WREG32_P(GENERAL_PWRMGT, 0, ~ENABLE_GEN2PCIE);
+}
+
+static void r7xx_program_memory_timing_parameters(struct radeon_device *rdev)
+{
+       struct radeon_ps *radeon_new_state = rdev->pm.dpm.requested_ps;
+
+       if ((rdev->family == CHIP_RV730) ||
+           (rdev->family == CHIP_RV710) ||
+           (rdev->family == CHIP_RV740))
+               rv730_program_memory_timing_parameters(rdev, radeon_new_state);
+       else
+               rv770_program_memory_timing_parameters(rdev, radeon_new_state);
+}
+
+static int rv770_upload_sw_state(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       struct radeon_ps *radeon_new_state = rdev->pm.dpm.requested_ps;
+       u16 address = pi->state_table_start +
+               offsetof(RV770_SMC_STATETABLE, driverState);
+       RV770_SMC_SWSTATE state = { 0 };
+       int ret;
+
+       ret = rv770_convert_power_state_to_smc(rdev, radeon_new_state, &state);
+       if (ret)
+               return ret;
+
+       return rv770_copy_bytes_to_smc(rdev, address, (const u8 *)&state,
+                                      sizeof(RV770_SMC_SWSTATE),
+                                      pi->sram_end);
+}
+
+int rv770_halt_smc(struct radeon_device *rdev)
+{
+       if (rv770_send_msg_to_smc(rdev, PPSMC_MSG_Halt) != PPSMC_Result_OK)
+               return -EINVAL;
+
+       if (rv770_wait_for_smc_inactive(rdev) != PPSMC_Result_OK)
+               return -EINVAL;
+
+       return 0;
+}
+
+int rv770_resume_smc(struct radeon_device *rdev)
+{
+       if (rv770_send_msg_to_smc(rdev, PPSMC_MSG_Resume) != PPSMC_Result_OK)
+               return -EINVAL;
+       return 0;
+}
+
+int rv770_set_sw_state(struct radeon_device *rdev)
+{
+       if (rv770_send_msg_to_smc(rdev, PPSMC_MSG_SwitchToSwState) != 
PPSMC_Result_OK)
+               return -EINVAL;
+       return 0;
+}
+
+int rv770_set_boot_state(struct radeon_device *rdev)
+{
+       if (rv770_send_msg_to_smc(rdev, PPSMC_MSG_SwitchToInitialState) != 
PPSMC_Result_OK)
+               return -EINVAL;
+       return 0;
+}
+
+int rv770_restrict_performance_levels_before_switch(struct radeon_device *rdev)
+{
+       if (rv770_send_msg_to_smc(rdev, (PPSMC_Msg)(PPSMC_MSG_NoForcedLevel)) 
!= PPSMC_Result_OK)
+               return -EINVAL;
+
+       if (rv770_send_msg_to_smc(rdev, 
(PPSMC_Msg)(PPSMC_MSG_TwoLevelsDisabled)) != PPSMC_Result_OK)
+               return -EINVAL;
+
+       return 0;
+}
+
+void r7xx_start_smc(struct radeon_device *rdev)
+{
+       rv770_start_smc(rdev);
+       rv770_start_smc_clock(rdev);
+}
+
+
+void r7xx_stop_smc(struct radeon_device *rdev)
+{
+       rv770_reset_smc(rdev);
+       rv770_stop_smc_clock(rdev);
+}
+
+static void rv770_read_clock_registers(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       pi->clk_regs.rv770.cg_spll_func_cntl =
+               RREG32(CG_SPLL_FUNC_CNTL);
+       pi->clk_regs.rv770.cg_spll_func_cntl_2 =
+               RREG32(CG_SPLL_FUNC_CNTL_2);
+       pi->clk_regs.rv770.cg_spll_func_cntl_3 =
+               RREG32(CG_SPLL_FUNC_CNTL_3);
+       pi->clk_regs.rv770.cg_spll_spread_spectrum =
+               RREG32(CG_SPLL_SPREAD_SPECTRUM);
+       pi->clk_regs.rv770.cg_spll_spread_spectrum_2 =
+               RREG32(CG_SPLL_SPREAD_SPECTRUM_2);
+       pi->clk_regs.rv770.mpll_ad_func_cntl =
+               RREG32(MPLL_AD_FUNC_CNTL);
+       pi->clk_regs.rv770.mpll_ad_func_cntl_2 =
+               RREG32(MPLL_AD_FUNC_CNTL_2);
+       pi->clk_regs.rv770.mpll_dq_func_cntl =
+               RREG32(MPLL_DQ_FUNC_CNTL);
+       pi->clk_regs.rv770.mpll_dq_func_cntl_2 =
+               RREG32(MPLL_DQ_FUNC_CNTL_2);
+       pi->clk_regs.rv770.mclk_pwrmgt_cntl =
+               RREG32(MCLK_PWRMGT_CNTL);
+       pi->clk_regs.rv770.dll_cntl = RREG32(DLL_CNTL);
+}
+
+static void r7xx_read_clock_registers(struct radeon_device *rdev)
+{
+       if (rdev->family == CHIP_RV740)
+               rv740_read_clock_registers(rdev);
+       else if ((rdev->family == CHIP_RV730) || (rdev->family == CHIP_RV710))
+               rv730_read_clock_registers(rdev);
+       else
+               rv770_read_clock_registers(rdev);
+}
+
+void rv770_read_voltage_smio_registers(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       pi->s0_vid_lower_smio_cntl =
+               RREG32(S0_VID_LOWER_SMIO_CNTL);
+}
+
+void rv770_reset_smio_status(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u32 sw_smio_index, vid_smio_cntl;
+
+       sw_smio_index =
+               (RREG32(GENERAL_PWRMGT) & SW_SMIO_INDEX_MASK) >> 
SW_SMIO_INDEX_SHIFT;
+       switch (sw_smio_index) {
+        case 3:
+               vid_smio_cntl = RREG32(S3_VID_LOWER_SMIO_CNTL);
+               break;
+        case 2:
+               vid_smio_cntl = RREG32(S2_VID_LOWER_SMIO_CNTL);
+               break;
+        case 1:
+               vid_smio_cntl = RREG32(S1_VID_LOWER_SMIO_CNTL);
+               break;
+        case 0:
+               return;
+        default:
+               vid_smio_cntl = pi->s0_vid_lower_smio_cntl;
+               break;
+       }
+
+       WREG32(S0_VID_LOWER_SMIO_CNTL, vid_smio_cntl);
+       WREG32_P(GENERAL_PWRMGT, SW_SMIO_INDEX(0), ~SW_SMIO_INDEX_MASK);
+}
+
+void rv770_get_memory_type(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u32 tmp;
+
+       tmp = RREG32(MC_SEQ_MISC0);
+
+       if (((tmp & MC_SEQ_MISC0_GDDR5_MASK) >> MC_SEQ_MISC0_GDDR5_SHIFT) ==
+           MC_SEQ_MISC0_GDDR5_VALUE)
+               pi->mem_gddr5 = true;
+       else
+               pi->mem_gddr5 = false;
+
+}
+
+void rv770_get_pcie_gen2_status(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u32 tmp;
+
+       tmp = RREG32_PCIE_PORT(PCIE_LC_SPEED_CNTL);
+
+       if ((tmp & LC_OTHER_SIDE_EVER_SENT_GEN2) &&
+           (tmp & LC_OTHER_SIDE_SUPPORTS_GEN2))
+               pi->pcie_gen2 = true;
+       else
+               pi->pcie_gen2 = false;
+
+       if (pi->pcie_gen2) {
+               if (tmp & LC_CURRENT_DATA_RATE)
+                       pi->boot_in_gen2 = true;
+               else
+                       pi->boot_in_gen2 = false;
+       } else
+               pi->boot_in_gen2 = false;
+}
+
+#if 0
+static int rv770_enter_ulp_state(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       if (pi->gfx_clock_gating) {
+               WREG32_P(SCLK_PWRMGT_CNTL, 0, ~DYN_GFX_CLK_OFF_EN);
+               WREG32_P(SCLK_PWRMGT_CNTL, GFX_CLK_FORCE_ON, ~GFX_CLK_FORCE_ON);
+               WREG32_P(SCLK_PWRMGT_CNTL, 0, ~GFX_CLK_FORCE_ON);
+               RREG32(GB_TILING_CONFIG);
+       }
+
+       WREG32_P(SMC_MSG, HOST_SMC_MSG(PPSMC_MSG_SwitchToMinimumPower),
+                ~HOST_SMC_MSG_MASK);
+
+       udelay(7000);
+
+       return 0;
+}
+
+static int rv770_exit_ulp_state(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       int i;
+
+       WREG32_P(SMC_MSG, HOST_SMC_MSG(PPSMC_MSG_ResumeFromMinimumPower),
+                ~HOST_SMC_MSG_MASK);
+
+       udelay(7000);
+
+       for (i = 0; i < rdev->usec_timeout; i++) {
+               if (((RREG32(SMC_MSG) & HOST_SMC_RESP_MASK) >> 
HOST_SMC_RESP_SHIFT) == 1)
+                       break;
+               udelay(1000);
+       }
+
+       if (pi->gfx_clock_gating)
+               WREG32_P(SCLK_PWRMGT_CNTL, DYN_GFX_CLK_OFF_EN, 
~DYN_GFX_CLK_OFF_EN);
+
+       return 0;
+}
+#endif
+
+static void rv770_get_mclk_odt_threshold(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u8 memory_module_index;
+       struct atom_memory_info memory_info;
+
+       pi->mclk_odt_threshold = 0;
+
+       if ((rdev->family == CHIP_RV730) || (rdev->family == CHIP_RV710)) {
+               memory_module_index = rv770_get_memory_module_index(rdev);
+
+               if (radeon_atom_get_memory_info(rdev, memory_module_index, 
&memory_info))
+                       return;
+
+               if (memory_info.mem_type == MEM_TYPE_DDR2 ||
+                   memory_info.mem_type == MEM_TYPE_DDR3)
+                       pi->mclk_odt_threshold = 30000;
+       }
+}
+
+void rv770_get_max_vddc(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       u16 vddc;
+
+       if (radeon_atom_get_max_vddc(rdev, 0, 0, &vddc))
+               pi->max_vddc = 0;
+       else
+               pi->max_vddc = vddc;
+}
+
+void rv770_program_response_times(struct radeon_device *rdev)
+{
+       u32 voltage_response_time, backbias_response_time;
+       u32 acpi_delay_time, vbi_time_out;
+       u32 vddc_dly, bb_dly, acpi_dly, vbi_dly;
+       u32 reference_clock;
+
+       voltage_response_time = (u32)rdev->pm.dpm.voltage_response_time;
+       backbias_response_time = (u32)rdev->pm.dpm.backbias_response_time;
+
+       if (voltage_response_time == 0)
+               voltage_response_time = 1000;
+
+       if (backbias_response_time == 0)
+               backbias_response_time = 1000;
+
+       acpi_delay_time = 15000;
+       vbi_time_out = 100000;
+
+       reference_clock = radeon_get_xclk(rdev);
+
+       vddc_dly = (voltage_response_time  * reference_clock) / 1600;
+       bb_dly = (backbias_response_time * reference_clock) / 1600;
+       acpi_dly = (acpi_delay_time * reference_clock) / 1600;
+       vbi_dly = (vbi_time_out * reference_clock) / 1600;
+
+       rv770_write_smc_soft_register(rdev,
+                                     RV770_SMC_SOFT_REGISTER_delay_vreg, 
vddc_dly);
+       rv770_write_smc_soft_register(rdev,
+                                     RV770_SMC_SOFT_REGISTER_delay_bbias, 
bb_dly);
+       rv770_write_smc_soft_register(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
+       /* XXX look up hw revision */
+       if (WEKIVA_A21)
+               rv770_write_smc_soft_register(rdev,
+                                             
RV770_SMC_SOFT_REGISTER_baby_step_timer,
+                                             0x10);
+#endif
+}
+
+static void rv770_program_dcodt_before_state_switch(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       struct radeon_ps *radeon_new_state = rdev->pm.dpm.requested_ps;
+       struct radeon_ps *radeon_current_state = rdev->pm.dpm.current_ps;
+       struct rv7xx_ps *new_state = rv770_get_ps(radeon_new_state);
+       struct rv7xx_ps *current_state = rv770_get_ps(radeon_current_state);
+       bool current_use_dc = false;
+       bool new_use_dc = false;
+
+       if (pi->mclk_odt_threshold == 0)
+               return;
+
+       if (current_state->high.mclk <= pi->mclk_odt_threshold)
+               current_use_dc = true;
+
+       if (new_state->high.mclk <= pi->mclk_odt_threshold)
+               new_use_dc = true;
+
+       if (current_use_dc == new_use_dc)
+               return;
+
+       if (!current_use_dc && new_use_dc)
+               return;
+
+       if ((rdev->family == CHIP_RV730) || (rdev->family == CHIP_RV710))
+               rv730_program_dcodt(rdev, new_use_dc);
+}
+
+static void rv770_program_dcodt_after_state_switch(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       struct radeon_ps *radeon_new_state = rdev->pm.dpm.requested_ps;
+       struct radeon_ps *radeon_current_state = rdev->pm.dpm.current_ps;
+       struct rv7xx_ps *new_state = rv770_get_ps(radeon_new_state);
+       struct rv7xx_ps *current_state = rv770_get_ps(radeon_current_state);
+       bool current_use_dc = false;
+       bool new_use_dc = false;
+
+       if (pi->mclk_odt_threshold == 0)
+               return;
+
+       if (current_state->high.mclk <= pi->mclk_odt_threshold)
+               current_use_dc = true;
+
+       if (new_state->high.mclk <= pi->mclk_odt_threshold)
+               new_use_dc = true;
+
+       if (current_use_dc == new_use_dc)
+               return;
+
+       if (current_use_dc && !new_use_dc)
+               return;
+
+       if ((rdev->family == CHIP_RV730) || (rdev->family == CHIP_RV710))
+               rv730_program_dcodt(rdev, new_use_dc);
+}
+
+static void rv770_retrieve_odt_values(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       if (pi->mclk_odt_threshold == 0)
+               return;
+
+       if ((rdev->family == CHIP_RV730) || (rdev->family == CHIP_RV710))
+               rv730_get_odt_values(rdev);
+}
+
+static void rv770_set_dpm_event_sources(struct radeon_device *rdev, u32 
sources)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       bool want_thermal_protection;
+       enum radeon_dpm_event_src dpm_event_src;
+
+       switch (sources) {
+        case 0:
+        default:
+               want_thermal_protection = false;
+               break;
+        case (1 << RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL):
+               want_thermal_protection = true;
+               dpm_event_src = RADEON_DPM_EVENT_SRC_DIGITAL;
+               break;
+
+        case (1 << RADEON_DPM_AUTO_THROTTLE_SRC_EXTERNAL):
+               want_thermal_protection = true;
+               dpm_event_src = RADEON_DPM_EVENT_SRC_EXTERNAL;
+               break;
+
+        case ((1 << RADEON_DPM_AUTO_THROTTLE_SRC_EXTERNAL) |
+             (1 << RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL)):
+               want_thermal_protection = true;
+               dpm_event_src = RADEON_DPM_EVENT_SRC_DIGIAL_OR_EXTERNAL;
+               break;
+       }
+
+       if (want_thermal_protection) {
+               WREG32_P(CG_THERMAL_CTRL, DPM_EVENT_SRC(dpm_event_src), 
~DPM_EVENT_SRC_MASK);
+               if (pi->thermal_protection)
+                       WREG32_P(GENERAL_PWRMGT, 0, ~THERMAL_PROTECTION_DIS);
+       } else {
+               WREG32_P(GENERAL_PWRMGT, THERMAL_PROTECTION_DIS, 
~THERMAL_PROTECTION_DIS);
+       }
+}
+
+void rv770_enable_auto_throttle_source(struct radeon_device *rdev,
+                                      enum radeon_dpm_auto_throttle_src source,
+                                      bool enable)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       if (enable) {
+               if (!(pi->active_auto_throttle_sources & (1 << source))) {
+                       pi->active_auto_throttle_sources |= 1 << source;
+                       rv770_set_dpm_event_sources(rdev, 
pi->active_auto_throttle_sources);
+               }
+       } else {
+               if (pi->active_auto_throttle_sources & (1 << source)) {
+                       pi->active_auto_throttle_sources &= ~(1 << source);
+                       rv770_set_dpm_event_sources(rdev, 
pi->active_auto_throttle_sources);
+               }
+       }
+}
+
+static int rv770_set_thermal_temperature_range(struct radeon_device *rdev,
+                                              int min_temp, int max_temp)
+{
+       int low_temp = 0 * 1000;
+       int high_temp = 255 * 1000;
+
+       if (low_temp < min_temp)
+               low_temp = min_temp;
+       if (high_temp > max_temp)
+               high_temp = max_temp;
+       if (high_temp < low_temp) {
+               DRM_ERROR("invalid thermal range: %d - %d\n", low_temp, 
high_temp);
+               return -EINVAL;
+       }
+
+       WREG32_P(CG_THERMAL_INT, DIG_THERM_INTH(high_temp / 1000), 
~DIG_THERM_INTH_MASK);
+       WREG32_P(CG_THERMAL_INT, DIG_THERM_INTL(low_temp / 1000), 
~DIG_THERM_INTL_MASK);
+       WREG32_P(CG_THERMAL_CTRL, DIG_THERM_DPM(high_temp / 1000), 
~DIG_THERM_DPM_MASK);
+
+       rdev->pm.dpm.thermal.min_temp = low_temp;
+       rdev->pm.dpm.thermal.max_temp = high_temp;
+
+       return 0;
+}
+
+int rv770_dpm_enable(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       if (pi->gfx_clock_gating)
+               rv770_restore_cgcg(rdev);
+
+       if (rv770_dpm_enabled(rdev))
+               return -EINVAL;
+
+       if (pi->voltage_control) {
+               rv770_enable_voltage_control(rdev, true);
+               rv770_construct_vddc_table(rdev);
+       }
+
+       if (pi->dcodt)
+               rv770_retrieve_odt_values(rdev);
+
+       if (pi->mvdd_control)
+               rv770_get_mvdd_configuration(rdev);
+
+       if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_BACKBIAS)
+               rv770_enable_backbias(rdev, true);
+
+       rv770_enable_spread_spectrum(rdev, true);
+
+       if (pi->thermal_protection)
+               rv770_enable_thermal_protection(rdev, true);
+
+       rv770_program_mpll_timing_parameters(rdev);
+       rv770_setup_bsp(rdev);
+       rv770_program_git(rdev);
+       rv770_program_tp(rdev);
+       rv770_program_tpp(rdev);
+       rv770_program_sstp(rdev);
+       rv770_program_engine_speed_parameters(rdev);
+       rv770_enable_display_gap(rdev);
+       rv770_program_vc(rdev);
+
+       if (pi->dynamic_pcie_gen2)
+               rv770_enable_dynamic_pcie_gen2(rdev, true);
+
+       if (rv770_upload_firmware(rdev))
+               return -EINVAL;
+       /* get ucode version ?  */
+       if (rv770_init_smc_table(rdev))
+               return -EINVAL;
+       rv770_program_response_times(rdev);
+       r7xx_start_smc(rdev);
+
+       if ((rdev->family == CHIP_RV730) || (rdev->family == CHIP_RV710))
+               rv730_start_dpm(rdev);
+       else
+               rv770_start_dpm(rdev);
+
+       if (pi->gfx_clock_gating)
+               rv770_gfx_clock_gating_enable(rdev, true);
+
+       if (pi->mg_clock_gating)
+               rv770_mg_clock_gating_enable(rdev, true);
+
+       if (rdev->irq.installed &&
+           r600_is_internal_thermal_sensor(rdev->pm.int_thermal_type)) {
+               PPSMC_Result result;
+
+               rv770_set_thermal_temperature_range(rdev, R600_TEMP_RANGE_MIN, 
R600_TEMP_RANGE_MAX);
+               rdev->irq.dpm_thermal = true;
+               radeon_irq_set(rdev);
+               result = rv770_send_msg_to_smc(rdev, 
PPSMC_MSG_EnableThermalInterrupt);
+
+               if (result != PPSMC_Result_OK)
+                       DRM_DEBUG_KMS("Could not enable thermal interrupts.\n");
+       }
+
+       rv770_enable_auto_throttle_source(rdev, 
RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL, true);
+
+       return 0;
+}
+
+void rv770_dpm_disable(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       if (!rv770_dpm_enabled(rdev))
+               return;
+
+       rv770_clear_vc(rdev);
+
+       if (pi->thermal_protection)
+               rv770_enable_thermal_protection(rdev, false);
+
+       rv770_enable_spread_spectrum(rdev, false);
+
+       if (pi->dynamic_pcie_gen2)
+               rv770_enable_dynamic_pcie_gen2(rdev, false);
+
+       if (rdev->irq.installed &&
+           r600_is_internal_thermal_sensor(rdev->pm.int_thermal_type)) {
+               rdev->irq.dpm_thermal = false;
+               radeon_irq_set(rdev);
+       }
+
+       if (pi->gfx_clock_gating)
+               rv770_gfx_clock_gating_enable(rdev, false);
+
+       if (pi->mg_clock_gating)
+               rv770_mg_clock_gating_enable(rdev, false);
+
+       if ((rdev->family == CHIP_RV730) || (rdev->family == CHIP_RV710))
+               rv730_stop_dpm(rdev);
+       else
+               rv770_stop_dpm(rdev);
+
+       r7xx_stop_smc(rdev);
+       rv770_reset_smio_status(rdev);
+}
+
+int rv770_dpm_set_power_state(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       rv770_restrict_performance_levels_before_switch(rdev);
+       rv770_halt_smc(rdev);
+       rv770_upload_sw_state(rdev);
+       r7xx_program_memory_timing_parameters(rdev);
+       if (pi->dcodt)
+               rv770_program_dcodt_before_state_switch(rdev);
+       rv770_resume_smc(rdev);
+       rv770_set_sw_state(rdev);
+       if (pi->dcodt)
+               rv770_program_dcodt_after_state_switch(rdev);
+
+       return 0;
+}
+
+void rv770_dpm_reset_asic(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       rv770_restrict_performance_levels_before_switch(rdev);
+       if (pi->dcodt)
+               rv770_program_dcodt_before_state_switch(rdev);
+       rv770_set_boot_state(rdev);
+       if (pi->dcodt)
+               rv770_program_dcodt_after_state_switch(rdev);
+}
+
+void rv770_dpm_setup_asic(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+
+       r7xx_read_clock_registers(rdev);
+       rv770_read_voltage_smio_registers(rdev);
+       rv770_get_memory_type(rdev);
+       if (pi->dcodt)
+               rv770_get_mclk_odt_threshold(rdev);
+       rv770_get_pcie_gen2_status(rdev);
+
+       rv770_enable_acpi_pm(rdev);
+
+       if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_ASPM_L0s)
+               rv770_enable_l0s(rdev);
+       if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_ASPM_L1)
+               rv770_enable_l1(rdev);
+       if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_TURNOFFPLL_ASPML1)
+               rv770_enable_pll_sleep_in_l1(rdev);
+}
+
+void rv770_dpm_display_configuration_changed(struct radeon_device *rdev)
+{
+       rv770_program_display_gap(rdev);
+}
+
+union power_info {
+       struct _ATOM_POWERPLAY_INFO info;
+       struct _ATOM_POWERPLAY_INFO_V2 info_2;
+       struct _ATOM_POWERPLAY_INFO_V3 info_3;
+       struct _ATOM_PPLIB_POWERPLAYTABLE pplib;
+       struct _ATOM_PPLIB_POWERPLAYTABLE2 pplib2;
+       struct _ATOM_PPLIB_POWERPLAYTABLE3 pplib3;
+};
+
+union pplib_clock_info {
+       struct _ATOM_PPLIB_R600_CLOCK_INFO r600;
+       struct _ATOM_PPLIB_RS780_CLOCK_INFO rs780;
+       struct _ATOM_PPLIB_EVERGREEN_CLOCK_INFO evergreen;
+       struct _ATOM_PPLIB_SUMO_CLOCK_INFO sumo;
+};
+
+union pplib_power_state {
+       struct _ATOM_PPLIB_STATE v1;
+       struct _ATOM_PPLIB_STATE_V2 v2;
+};
+
+static void rv7xx_parse_pplib_non_clock_info(struct radeon_device *rdev,
+                                            struct radeon_ps *rps,
+                                            struct _ATOM_PPLIB_NONCLOCK_INFO 
*non_clock_info,
+                                            u8 table_rev)
+{
+       rps->caps = le32_to_cpu(non_clock_info->ulCapsAndSettings);
+       rps->class = le16_to_cpu(non_clock_info->usClassification);
+       rps->class2 = le16_to_cpu(non_clock_info->usClassification2);
+
+       if (ATOM_PPLIB_NONCLOCKINFO_VER1 < table_rev) {
+               rps->vclk = le32_to_cpu(non_clock_info->ulVCLK);
+               rps->dclk = le32_to_cpu(non_clock_info->ulDCLK);
+       } else if (r600_is_uvd_state(rps->class, rps->class2)) {
+               rps->vclk = RV770_DEFAULT_VCLK_FREQ;
+               rps->dclk = RV770_DEFAULT_DCLK_FREQ;
+       } else {
+               rps->vclk = 0;
+               rps->dclk = 0;
+       }
+
+       if (rps->class & ATOM_PPLIB_CLASSIFICATION_BOOT)
+               rdev->pm.dpm.boot_ps = rps;
+       if (rps->class & ATOM_PPLIB_CLASSIFICATION_UVDSTATE)
+               rdev->pm.dpm.uvd_ps = rps;
+}
+
+static void rv7xx_parse_pplib_clock_info(struct radeon_device *rdev,
+                                        struct radeon_ps *rps, int index,
+                                        union pplib_clock_info *clock_info)
+{
+       struct rv7xx_power_info *pi = rv770_get_pi(rdev);
+       struct rv7xx_ps *ps = rv770_get_ps(rps);
+       u32 sclk, mclk;
+       u16 vddc;
+       struct rv7xx_pl *pl;
+
+       switch (index) {
+       case 0:
+               pl = &ps->low;
+               break;
+       case 1:
+               pl = &ps->medium;
+               break;
+       case 2:
+       default:
+               pl = &ps->high;
+               break;
+       }
+
+       sclk = le16_to_cpu(clock_info->r600.usEngineClockLow);
+       sclk |= clock_info->r600.ucEngineClockHigh << 16;
+       mclk = le16_to_cpu(clock_info->r600.usMemoryClockLow);
+       mclk |= clock_info->r600.ucMemoryClockHigh << 16;
+
+       pl->vddc = le16_to_cpu(clock_info->r600.usVDDC);
+       pl->flags = le32_to_cpu(clock_info->r600.ulFlags);
+
+       pl->mclk = mclk;
+       pl->sclk = sclk;
+
+       /* patch up vddc if necessary */
+       if (pl->vddc == 0xff01) {
+               if (radeon_atom_get_max_vddc(rdev, 0, 0, &vddc) == 0)
+                       pl->vddc = vddc;
+       }
+
+       if (rps->class & ATOM_PPLIB_CLASSIFICATION_ACPI) {
+               pi->acpi_vddc = pl->vddc;
+               if (ps->low.flags & ATOM_PPLIB_R600_FLAGS_PCIEGEN2)
+                       pi->acpi_pcie_gen2 = true;
+               else
+                       pi->acpi_pcie_gen2 = false;
+       }
+
+       if (pi->min_vddc_in_table > pl->vddc)
+               pi->min_vddc_in_table = pl->vddc;
+
+       if (pi->max_vddc_in_table < pl->vddc)
+               pi->max_vddc_in_table = pl->vddc;
+
+       /* patch up boot state */
+       if (rps->class & ATOM_PPLIB_CLASSIFICATION_BOOT) {
+               u16 vddc, vddci;
+               radeon_atombios_get_default_voltages(rdev, &vddc, &vddci);
+               pl->mclk = rdev->clock.default_mclk;
+               pl->sclk = rdev->clock.default_sclk;
+               pl->vddc = vddc;
+               pl->vddci = vddci;
+       }
+}
+
+int rv7xx_parse_power_table(struct radeon_device *rdev)
+{
+       struct radeon_mode_info *mode_info = &rdev->mode_info;
+       struct _ATOM_PPLIB_NONCLOCK_INFO *non_clock_info;
+       union pplib_power_state *power_state;
+       int i, j;
+       union pplib_clock_info *clock_info;
+       union power_info *power_info;
+       int index = GetIndexIntoMasterTable(DATA, PowerPlayInfo);
+        u16 data_offset;
+       u8 frev, crev;
+       struct rv7xx_ps *ps;
+
+       if (!atom_parse_data_header(mode_info->atom_context, index, NULL,
+                                  &frev, &crev, &data_offset))
+               return -EINVAL;
+       power_info = (union power_info *)(mode_info->atom_context->bios + 
data_offset);
+
+       rdev->pm.dpm.ps = kzalloc(sizeof(struct radeon_ps) *
+                                 power_info->pplib.ucNumStates, GFP_KERNEL);
+       if (!rdev->pm.dpm.ps)
+               return -ENOMEM;
+       rdev->pm.dpm.platform_caps = 
le32_to_cpu(power_info->pplib.ulPlatformCaps);
+       rdev->pm.dpm.backbias_response_time = 
le16_to_cpu(power_info->pplib.usBackbiasTime);
+       rdev->pm.dpm.voltage_response_time = 
le16_to_cpu(power_info->pplib.usVoltageTime);
+
+       for (i = 0; i < power_info->pplib.ucNumStates; i++) {
+               power_state = (union pplib_power_state *)
+                       (mode_info->atom_context->bios + data_offset +
+                        le16_to_cpu(power_info->pplib.usStateArrayOffset) +
+                        i * power_info->pplib.ucStateEntrySize);
+               non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *)
+                       (mode_info->atom_context->bios + data_offset +
+                        
le16_to_cpu(power_info->pplib.usNonClockInfoArrayOffset) +
+                        (power_state->v1.ucNonClockStateIndex *
+                         power_info->pplib.ucNonClockSize));
+               if (power_info->pplib.ucStateEntrySize - 1) {
+                       ps = kzalloc(sizeof(struct rv7xx_ps), GFP_KERNEL);
+                       if (ps == NULL) {
+                               kfree(rdev->pm.dpm.ps);
+                               return -ENOMEM;
+                       }
+                       rdev->pm.dpm.ps[i].ps_priv = ps;
+                       rv7xx_parse_pplib_non_clock_info(rdev, 
&rdev->pm.dpm.ps[i],
+                                                        non_clock_info,
+                                                        
power_info->pplib.ucNonClockSize);
+                       for (j = 0; j < (power_info->pplib.ucStateEntrySize - 
1); j++) {
+                               clock_info = (union pplib_clock_info *)
+                                       (mode_info->atom_context->bios + 
data_offset +
+                                        
le16_to_cpu(power_info->pplib.usClockInfoArrayOffset) +
+                                        
(power_state->v1.ucClockStateIndices[j] *
+                                         power_info->pplib.ucClockInfoSize));
+                               rv7xx_parse_pplib_clock_info(rdev,
+                                                            
&rdev->pm.dpm.ps[i], j,
+                                                            clock_info);
+                       }
+               }
+       }
+       rdev->pm.dpm.num_ps = power_info->pplib.ucNumStates;
+       return 0;
+}
+
+int rv770_dpm_init(struct radeon_device *rdev)
+{
+       struct rv7xx_power_info *pi;
+       int index = GetIndexIntoMasterTable(DATA, ASIC_InternalSS_Info);
+       uint16_t data_offset, size;
+       uint8_t frev, crev;
+       struct atom_clock_dividers dividers;
+       int ret;
+
+       pi = kzalloc(sizeof(struct rv7xx_power_info), GFP_KERNEL);
+       if (pi == NULL)
+               return -ENOMEM;
+       rdev->pm.dpm.priv = pi;
+
+       rv770_get_max_vddc(rdev);
+
+       pi->acpi_vddc = 0;
+       pi->min_vddc_in_table = 0;
+       pi->max_vddc_in_table = 0;
+
+       ret = rv7xx_parse_power_table(rdev);
+       if (ret)
+               return ret;
+
+       if (rdev->pm.dpm.voltage_response_time == 0)
+               rdev->pm.dpm.voltage_response_time = 
R600_VOLTAGERESPONSETIME_DFLT;
+       if (rdev->pm.dpm.backbias_response_time == 0)
+               rdev->pm.dpm.backbias_response_time = 
R600_BACKBIASRESPONSETIME_DFLT;
+
+       ret = radeon_atom_get_clock_dividers(rdev, COMPUTE_ENGINE_PLL_PARAM,
+                                            0, false, &dividers);
+       if (ret)
+               pi->ref_div = dividers.ref_div + 1;
+       else
+               pi->ref_div = R600_REFERENCEDIVIDER_DFLT;
+
+       pi->mclk_strobe_mode_threshold = 30000;
+       pi->mclk_edc_enable_threshold = 30000;
+
+       pi->voltage_control =
+               radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC);
+
+       pi->mvdd_control =
+               radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_MVDDC);
+
+       if (atom_parse_data_header(rdev->mode_info.atom_context, index, &size,
+                                   &frev, &crev, &data_offset)) {
+               pi->sclk_ss = true;
+               pi->mclk_ss = true;
+               pi->dynamic_ss = true;
+       } else {
+               pi->sclk_ss = false;
+               pi->mclk_ss = false;
+               pi->dynamic_ss = false;
+       }
+
+       pi->asi = RV770_ASI_DFLT;
+       pi->pasi = RV770_HASI_DFLT;
+       pi->vrc = RV770_VRC_DFLT;
+
+       pi->power_gating = false;
+
+       pi->gfx_clock_gating = true;
+
+       pi->mg_clock_gating = true;
+       pi->mgcgtssm = true;
+
+       pi->dynamic_pcie_gen2 = true;
+
+       if (pi->gfx_clock_gating &&
+           (rdev->pm.int_thermal_type != THERMAL_TYPE_NONE))
+               pi->thermal_protection = true;
+       else
+               pi->thermal_protection = false;
+
+       pi->display_gap = true;
+
+       if (rdev->flags & RADEON_IS_MOBILITY)
+               pi->dcodt = true;
+       else
+               pi->dcodt = false;
+
+       pi->ulps = true;
+
+       pi->mclk_stutter_mode_threshold = 0;
+
+       pi->sram_end = SMC_RAM_END;
+       pi->state_table_start = RV770_SMC_TABLE_ADDRESS;
+       pi->soft_regs_start = RV770_SMC_SOFT_REGISTERS_START;
+
+       return 0;
+}
+
+void rv770_dpm_print_power_state(struct radeon_device *rdev,
+                                struct radeon_ps *rps)
+{
+       struct rv7xx_ps *ps = rv770_get_ps(rps);
+       struct rv7xx_pl *pl;
+
+       r600_dpm_print_class_info(rps->class, rps->class2);
+       r600_dpm_print_cap_info(rps->caps);
+       printk("\tuvd    vclk: %d dclk: %d\n", rps->vclk, rps->dclk);
+       if (rdev->family >= CHIP_CEDAR) {
+               pl = &ps->low;
+               printk("\t\tpower level 0    sclk: %u mclk: %u vddc: %u vddci: 
%u\n",
+                      pl->sclk, pl->mclk, pl->vddc, pl->vddci);
+               pl = &ps->medium;
+               printk("\t\tpower level 1    sclk: %u mclk: %u vddc: %u vddci: 
%u\n",
+                      pl->sclk, pl->mclk, pl->vddc, pl->vddci);
+               pl = &ps->high;
+               printk("\t\tpower level 2    sclk: %u mclk: %u vddc: %u vddci: 
%u\n",
+                      pl->sclk, pl->mclk, pl->vddc, pl->vddci);
+       } else {
+               pl = &ps->low;
+               printk("\t\tpower level 0    sclk: %u mclk: %u vddc: %u\n",
+                      pl->sclk, pl->mclk, pl->vddc);
+               pl = &ps->medium;
+               printk("\t\tpower level 1    sclk: %u mclk: %u vddc: %u\n",
+                      pl->sclk, pl->mclk, pl->vddc);
+               pl = &ps->high;
+               printk("\t\tpower level 2    sclk: %u mclk: %u vddc: %u\n",
+                      pl->sclk, pl->mclk, pl->vddc);
+       }
+       r600_dpm_print_ps_status(rdev, rps);
+}
+
+void rv770_dpm_fini(struct radeon_device *rdev)
+{
+       int i;
+
+       for (i = 0; i < rdev->pm.dpm.num_ps; i++) {
+               kfree(rdev->pm.dpm.ps[i].ps_priv);
+       }
+       kfree(rdev->pm.dpm.ps);
+       kfree(rdev->pm.dpm.priv);
+}
+
+u32 rv770_dpm_get_sclk(struct radeon_device *rdev, bool low)
+{
+       struct rv7xx_ps *requested_state = 
rv770_get_ps(rdev->pm.dpm.requested_ps);
+
+       if (low)
+               return requested_state->low.sclk;
+       else
+               return requested_state->high.sclk;
+}
+
+u32 rv770_dpm_get_mclk(struct radeon_device *rdev, bool low)
+{
+       struct rv7xx_ps *requested_state = 
rv770_get_ps(rdev->pm.dpm.requested_ps);
+
+       if (low)
+               return requested_state->low.mclk;
+       else
+               return requested_state->high.mclk;
+}
diff --git a/drivers/gpu/drm/radeon/rv770_dpm.h 
b/drivers/gpu/drm/radeon/rv770_dpm.h
new file mode 100644
index 0000000..df9aae5
--- /dev/null
+++ b/drivers/gpu/drm/radeon/rv770_dpm.h
@@ -0,0 +1,272 @@
+/*
+ * Copyright 2011 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+#ifndef __RV770_DPM_H__
+#define __RV770_DPM_H__
+
+#include "rv770_smc.h"
+
+struct rv770_clock_registers {
+       u32 cg_spll_func_cntl;
+       u32 cg_spll_func_cntl_2;
+       u32 cg_spll_func_cntl_3;
+       u32 cg_spll_spread_spectrum;
+       u32 cg_spll_spread_spectrum_2;
+       u32 mpll_ad_func_cntl;
+       u32 mpll_ad_func_cntl_2;
+       u32 mpll_dq_func_cntl;
+       u32 mpll_dq_func_cntl_2;
+       u32 mclk_pwrmgt_cntl;
+       u32 dll_cntl;
+       u32 mpll_ss1;
+       u32 mpll_ss2;
+};
+
+struct rv730_clock_registers {
+       u32 cg_spll_func_cntl;
+       u32 cg_spll_func_cntl_2;
+       u32 cg_spll_func_cntl_3;
+       u32 cg_spll_spread_spectrum;
+       u32 cg_spll_spread_spectrum_2;
+       u32 mclk_pwrmgt_cntl;
+       u32 dll_cntl;
+       u32 mpll_func_cntl;
+       u32 mpll_func_cntl2;
+       u32 mpll_func_cntl3;
+       u32 mpll_ss;
+       u32 mpll_ss2;
+};
+
+union r7xx_clock_registers {
+       struct rv770_clock_registers rv770;
+       struct rv730_clock_registers rv730;
+};
+
+struct vddc_table_entry {
+       u16 vddc;
+       u8 vddc_index;
+       u8 high_smio;
+       u32 low_smio;
+};
+
+#define MAX_NO_OF_MVDD_VALUES 2
+#define MAX_NO_VREG_STEPS 32
+
+struct rv7xx_power_info {
+       /* flags */
+       bool mem_gddr5;
+       bool pcie_gen2;
+       bool dynamic_pcie_gen2;
+       bool acpi_pcie_gen2;
+       bool boot_in_gen2;
+       bool voltage_control; /* vddc */
+       bool mvdd_control;
+       bool sclk_ss;
+       bool mclk_ss;
+       bool dynamic_ss;
+       bool gfx_clock_gating;
+       bool mg_clock_gating;
+       bool mgcgtssm;
+       bool power_gating;
+       bool thermal_protection;
+       bool display_gap;
+       bool dcodt;
+       bool ulps;
+       /* registers */
+       union r7xx_clock_registers clk_regs;
+       u32 s0_vid_lower_smio_cntl;
+       /* voltage */
+       u32 vddc_mask_low;
+       u32 mvdd_mask_low;
+       u32 mvdd_split_frequency;
+       u32 mvdd_low_smio[MAX_NO_OF_MVDD_VALUES];
+       u16 max_vddc;
+       u16 max_vddc_in_table;
+       u16 min_vddc_in_table;
+       struct vddc_table_entry vddc_table[MAX_NO_VREG_STEPS];
+       u8 valid_vddc_entries;
+       /* dc odt */
+       u32 mclk_odt_threshold;
+       u8 odt_value_0[2];
+       u8 odt_value_1[2];
+       /* stored values */
+       u32 boot_sclk;
+       u16 acpi_vddc;
+       u32 ref_div;
+       u32 active_auto_throttle_sources;
+       u32 mclk_stutter_mode_threshold;
+       u32 mclk_strobe_mode_threshold;
+       u32 mclk_edc_enable_threshold;
+       u32 bsp;
+       u32 bsu;
+       u32 pbsp;
+       u32 pbsu;
+       u32 dsp;
+       u32 psp;
+       u32 asi;
+       u32 pasi;
+       u32 vrc;
+       u32 restricted_levels;
+       /* smc offsets */
+       u16 state_table_start;
+       u16 soft_regs_start;
+       u16 sram_end;
+       /* scratch structs */
+       RV770_SMC_STATETABLE smc_statetable;
+};
+
+struct rv7xx_pl {
+       u32 sclk;
+       u32 mclk;
+       u16 vddc;
+       u16 vddci; /* eg+ only */
+       u32 flags;
+};
+
+struct rv7xx_ps {
+       struct rv7xx_pl high;
+       struct rv7xx_pl medium;
+       struct rv7xx_pl low;
+       bool dc_compatible;
+};
+
+#define RV770_RLP_DFLT                                10
+#define RV770_RMP_DFLT                                25
+#define RV770_LHP_DFLT                                25
+#define RV770_LMP_DFLT                                10
+#define RV770_VRC_DFLT                                0x003f
+#define RV770_ASI_DFLT                                1000
+#define RV770_HASI_DFLT                               200000
+#define RV770_MGCGTTLOCAL0_DFLT                       0x00100000
+#define RV7XX_MGCGTTLOCAL0_DFLT                       0
+#define RV770_MGCGTTLOCAL1_DFLT                       0xFFFF0000
+#define RV770_MGCGCGTSSMCTRL_DFLT                     0x55940000
+
+#define MVDD_LOW_INDEX  0
+#define MVDD_HIGH_INDEX 1
+
+#define MVDD_LOW_VALUE  0
+#define MVDD_HIGH_VALUE 0xffff
+
+#define RV770_DEFAULT_VCLK_FREQ  53300 /* 10 khz */
+#define RV770_DEFAULT_DCLK_FREQ  40000 /* 10 khz */
+
+/* rv730/rv710 */
+int rv730_populate_sclk_value(struct radeon_device *rdev,
+                             u32 engine_clock,
+                             RV770_SMC_SCLK_VALUE *sclk);
+int rv730_populate_mclk_value(struct radeon_device *rdev,
+                             u32 engine_clock, u32 memory_clock,
+                             LPRV7XX_SMC_MCLK_VALUE mclk);
+void rv730_read_clock_registers(struct radeon_device *rdev);
+int rv730_populate_smc_acpi_state(struct radeon_device *rdev,
+                                 RV770_SMC_STATETABLE *table);
+int rv730_populate_smc_initial_state(struct radeon_device *rdev,
+                                    struct radeon_ps *radeon_initial_state,
+                                    RV770_SMC_STATETABLE *table);
+void rv730_program_memory_timing_parameters(struct radeon_device *rdev,
+                                           struct radeon_ps *radeon_state);
+void rv730_power_gating_enable(struct radeon_device *rdev,
+                              bool enable);
+void rv730_start_dpm(struct radeon_device *rdev);
+void rv730_stop_dpm(struct radeon_device *rdev);
+void rv730_program_dcodt(struct radeon_device *rdev, bool use_dcodt);
+void rv730_get_odt_values(struct radeon_device *rdev);
+
+/* rv740 */
+int rv740_populate_sclk_value(struct radeon_device *rdev, u32 engine_clock,
+                             RV770_SMC_SCLK_VALUE *sclk);
+int rv740_populate_mclk_value(struct radeon_device *rdev,
+                             u32 engine_clock, u32 memory_clock,
+                             RV7XX_SMC_MCLK_VALUE *mclk);
+void rv740_read_clock_registers(struct radeon_device *rdev);
+int rv740_populate_smc_acpi_state(struct radeon_device *rdev,
+                                 RV770_SMC_STATETABLE *table);
+void rv740_enable_mclk_spread_spectrum(struct radeon_device *rdev,
+                                      bool enable);
+u8 rv740_get_mclk_frequency_ratio(u32 memory_clock);
+u32 rv740_get_dll_speed(bool is_gddr5, u32 memory_clock);
+u32 rv740_get_decoded_reference_divider(u32 encoded_ref);
+
+/* rv770 */
+u32 rv770_map_clkf_to_ibias(struct radeon_device *rdev, u32 clkf);
+int rv770_populate_vddc_value(struct radeon_device *rdev, u16 vddc,
+                             RV770_SMC_VOLTAGE_VALUE *voltage);
+int rv770_populate_mvdd_value(struct radeon_device *rdev, u32 mclk,
+                             RV770_SMC_VOLTAGE_VALUE *voltage);
+u8 rv770_get_seq_value(struct radeon_device *rdev,
+                      struct rv7xx_pl *pl);
+int rv770_populate_initial_mvdd_value(struct radeon_device *rdev,
+                                     RV770_SMC_VOLTAGE_VALUE *voltage);
+u32 rv770_calculate_memory_refresh_rate(struct radeon_device *rdev,
+                                       u32 engine_clock);
+void rv770_program_response_times(struct radeon_device *rdev);
+int rv770_populate_smc_sp(struct radeon_device *rdev,
+                         struct radeon_ps *radeon_state,
+                         RV770_SMC_SWSTATE *smc_state);
+int rv770_populate_smc_t(struct radeon_device *rdev,
+                        struct radeon_ps *radeon_state,
+                        RV770_SMC_SWSTATE *smc_state);
+void rv770_read_voltage_smio_registers(struct radeon_device *rdev);
+void rv770_get_memory_type(struct radeon_device *rdev);
+void r7xx_start_smc(struct radeon_device *rdev);
+u8 rv770_get_memory_module_index(struct radeon_device *rdev);
+void rv770_get_max_vddc(struct radeon_device *rdev);
+void rv770_get_pcie_gen2_status(struct radeon_device *rdev);
+void rv770_enable_acpi_pm(struct radeon_device *rdev);
+void rv770_restore_cgcg(struct radeon_device *rdev);
+bool rv770_dpm_enabled(struct radeon_device *rdev);
+void rv770_enable_voltage_control(struct radeon_device *rdev,
+                                 bool enable);
+void rv770_enable_backbias(struct radeon_device *rdev,
+                          bool enable);
+void rv770_enable_thermal_protection(struct radeon_device *rdev,
+                                    bool enable);
+void rv770_enable_auto_throttle_source(struct radeon_device *rdev,
+                                      enum radeon_dpm_auto_throttle_src source,
+                                      bool enable);
+void rv770_setup_bsp(struct radeon_device *rdev);
+void rv770_program_git(struct radeon_device *rdev);
+void rv770_program_tp(struct radeon_device *rdev);
+void rv770_program_tpp(struct radeon_device *rdev);
+void rv770_program_sstp(struct radeon_device *rdev);
+void rv770_program_engine_speed_parameters(struct radeon_device *rdev);
+void rv770_program_vc(struct radeon_device *rdev);
+void rv770_clear_vc(struct radeon_device *rdev);
+int rv770_upload_firmware(struct radeon_device *rdev);
+void rv770_stop_dpm(struct radeon_device *rdev);
+void r7xx_stop_smc(struct radeon_device *rdev);
+void rv770_reset_smio_status(struct radeon_device *rdev);
+int rv770_restrict_performance_levels_before_switch(struct radeon_device 
*rdev);
+int rv770_halt_smc(struct radeon_device *rdev);
+int rv770_resume_smc(struct radeon_device *rdev);
+int rv770_set_sw_state(struct radeon_device *rdev);
+int rv770_set_boot_state(struct radeon_device *rdev);
+int rv7xx_parse_power_table(struct radeon_device *rdev);
+
+/* smc */
+int rv770_read_smc_soft_register(struct radeon_device *rdev,
+                                u16 reg_offset, u32 *value);
+int rv770_write_smc_soft_register(struct radeon_device *rdev,
+                                 u16 reg_offset, u32 value);
+
+#endif
diff --git a/drivers/gpu/drm/radeon/rv770_smc.c 
b/drivers/gpu/drm/radeon/rv770_smc.c
new file mode 100644
index 0000000..8e07153
--- /dev/null
+++ b/drivers/gpu/drm/radeon/rv770_smc.c
@@ -0,0 +1,404 @@
+/*
+ * Copyright 2011 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Alex Deucher
+ */
+
+#include <linux/firmware.h>
+#include "drmP.h"
+#include "radeon.h"
+#include "rv770d.h"
+#include "rv770_dpm.h"
+#include "rv770_smc.h"
+#include "atom.h"
+#include "radeon_ucode.h"
+
+#define FIRST_SMC_INT_VECT_REG 0xFFD8
+#define FIRST_INT_VECT_S19     0xFFC0
+
+static const u8 rv770_smc_int_vectors[] =
+{
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x0C, 0xD7,
+       0x08, 0x2B, 0x08, 0x10,
+       0x03, 0x51, 0x03, 0x51,
+       0x03, 0x51, 0x03, 0x51
+};
+
+static const u8 rv730_smc_int_vectors[] =
+{
+       0x08, 0x15, 0x08, 0x15,
+       0x08, 0x15, 0x08, 0x15,
+       0x08, 0x15, 0x08, 0x15,
+       0x08, 0x15, 0x08, 0x15,
+       0x08, 0x15, 0x08, 0x15,
+       0x08, 0x15, 0x08, 0x15,
+       0x08, 0x15, 0x08, 0x15,
+       0x08, 0x15, 0x08, 0x15,
+       0x08, 0x15, 0x08, 0x15,
+       0x08, 0x15, 0x08, 0x15,
+       0x08, 0x15, 0x08, 0x15,
+       0x08, 0x15, 0x08, 0x15,
+       0x08, 0x15, 0x0C, 0xBB,
+       0x08, 0x30, 0x08, 0x15,
+       0x03, 0x56, 0x03, 0x56,
+       0x03, 0x56, 0x03, 0x56
+};
+
+static const u8 rv710_smc_int_vectors[] =
+{
+       0x08, 0x04, 0x08, 0x04,
+       0x08, 0x04, 0x08, 0x04,
+       0x08, 0x04, 0x08, 0x04,
+       0x08, 0x04, 0x08, 0x04,
+       0x08, 0x04, 0x08, 0x04,
+       0x08, 0x04, 0x08, 0x04,
+       0x08, 0x04, 0x08, 0x04,
+       0x08, 0x04, 0x08, 0x04,
+       0x08, 0x04, 0x08, 0x04,
+       0x08, 0x04, 0x08, 0x04,
+       0x08, 0x04, 0x08, 0x04,
+       0x08, 0x04, 0x08, 0x04,
+       0x08, 0x04, 0x0C, 0xCB,
+       0x08, 0x1F, 0x08, 0x04,
+       0x03, 0x51, 0x03, 0x51,
+       0x03, 0x51, 0x03, 0x51
+};
+
+static const u8 rv740_smc_int_vectors[] =
+{
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x08, 0x10,
+       0x08, 0x10, 0x0C, 0xD7,
+       0x08, 0x2B, 0x08, 0x10,
+       0x03, 0x51, 0x03, 0x51,
+       0x03, 0x51, 0x03, 0x51
+};
+
+int rv770_set_smc_sram_address(struct radeon_device *rdev,
+                              u16 smc_address, u16 limit)
+{
+       u32 addr;
+
+       if (smc_address & 3)
+               return -EINVAL;
+       if ((smc_address + 3) > limit)
+               return -EINVAL;
+
+       addr = smc_address;
+       addr |= SMC_SRAM_AUTO_INC_DIS;
+
+       WREG32(SMC_SRAM_ADDR, addr);
+
+       return 0;
+}
+
+int rv770_copy_bytes_to_smc(struct radeon_device *rdev,
+                           u16 smc_start_address, const u8 *src,
+                           u16 byte_count, u16 limit)
+{
+       u32 data, original_data, extra_shift;
+       u16 addr;
+       int ret;
+
+       if (smc_start_address & 3)
+               return -EINVAL;
+       if ((smc_start_address + byte_count) > limit)
+               return -EINVAL;
+
+       addr = smc_start_address;
+
+       while (byte_count >= 4) {
+               /* SMC address space is BE */
+               data = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) | src[3];
+
+               ret = rv770_set_smc_sram_address(rdev, addr, limit);
+               if (ret)
+                       return ret;
+
+               WREG32(SMC_SRAM_DATA, data);
+
+               src += 4;
+               byte_count -= 4;
+               addr += 4;
+       }
+
+       /* RMW for final bytes */
+       if (byte_count > 0) {
+               data = 0;
+
+               ret = rv770_set_smc_sram_address(rdev, addr, limit);
+               if (ret)
+                       return ret;
+
+               original_data = RREG32(SMC_SRAM_DATA);
+
+               extra_shift = 8 * (4 - byte_count);
+
+               while (byte_count > 0) {
+                       /* SMC address space is BE */
+                       data = (data << 8) + *src++;
+                       byte_count--;
+               }
+
+               data <<= extra_shift;
+
+               data |= (original_data & ~((~0UL) << extra_shift));
+
+               ret = rv770_set_smc_sram_address(rdev, addr, limit);
+               if (ret)
+                       return ret;
+
+               WREG32(SMC_SRAM_DATA, data);
+       }
+
+       return 0;
+}
+
+static int rv770_program_interrupt_vectors(struct radeon_device *rdev,
+                                          u32 smc_first_vector, const u8 *src,
+                                          u32 byte_count)
+{
+       u32 tmp, i;
+
+       if (byte_count % 4)
+               return -EINVAL;
+
+       if (smc_first_vector < FIRST_SMC_INT_VECT_REG) {
+               tmp = FIRST_SMC_INT_VECT_REG - smc_first_vector;
+
+               if (tmp > byte_count)
+                       return 0;
+
+               byte_count -= tmp;
+               src += tmp;
+               smc_first_vector = FIRST_SMC_INT_VECT_REG;
+       }
+
+       for (i = 0; i < byte_count; i += 4) {
+               /* SMC address space is BE */
+               tmp = (src[i] << 24) | (src[i + 1] << 16) | (src[i + 2] << 8) | 
src[i + 3];
+
+               WREG32(SMC_ISR_FFD8_FFDB + i, tmp);
+       }
+
+       return 0;
+}
+
+void rv770_start_smc(struct radeon_device *rdev)
+{
+       WREG32_P(SMC_IO, SMC_RST_N, ~SMC_RST_N);
+}
+
+void rv770_reset_smc(struct radeon_device *rdev)
+{
+       WREG32_P(SMC_IO, 0, ~SMC_RST_N);
+}
+
+void rv770_stop_smc_clock(struct radeon_device *rdev)
+{
+       WREG32_P(SMC_IO, 0, ~SMC_CLK_EN);
+}
+
+void rv770_start_smc_clock(struct radeon_device *rdev)
+{
+       WREG32_P(SMC_IO, SMC_CLK_EN, ~SMC_CLK_EN);
+}
+
+bool rv770_is_smc_running(struct radeon_device *rdev)
+{
+       u32 tmp;
+
+       tmp = RREG32(SMC_IO);
+
+       if ((tmp & SMC_RST_N) && (tmp & SMC_CLK_EN))
+               return true;
+       else
+               return false;
+}
+
+PPSMC_Result rv770_send_msg_to_smc(struct radeon_device *rdev, PPSMC_Msg msg)
+{
+       u32 tmp;
+       int i;
+       PPSMC_Result result;
+
+       if (!rv770_is_smc_running(rdev))
+               return PPSMC_Result_Failed;
+
+       WREG32_P(SMC_MSG, HOST_SMC_MSG(msg), ~HOST_SMC_MSG_MASK);
+
+       for (i = 0; i < rdev->usec_timeout; i++) {
+               tmp = RREG32(SMC_MSG) & HOST_SMC_RESP_MASK;
+               tmp >>= HOST_SMC_RESP_SHIFT;
+               if (tmp != 0)
+                       break;
+               udelay(1);
+       }
+
+       tmp = RREG32(SMC_MSG) & HOST_SMC_RESP_MASK;
+       tmp >>= HOST_SMC_RESP_SHIFT;
+
+       result = (PPSMC_Result)tmp;
+       return result;
+}
+
+PPSMC_Result rv770_wait_for_smc_inactive(struct radeon_device *rdev)
+{
+       int i;
+       PPSMC_Result result = PPSMC_Result_OK;
+
+       if (!rv770_is_smc_running(rdev))
+               return result;
+
+       for (i = 0; i < rdev->usec_timeout; i++) {
+               if (RREG32(SMC_IO) & SMC_STOP_MODE)
+                       break;
+               udelay(1);
+       }
+
+       return result;
+}
+
+static void rv770_clear_smc_sram(struct radeon_device *rdev, u16 limit)
+{
+       u16 i;
+
+       for (i = 0;  i < limit; i += 4) {
+               rv770_set_smc_sram_address(rdev, i, limit);
+               WREG32(SMC_SRAM_DATA, 0);
+       }
+}
+
+int rv770_load_smc_ucode(struct radeon_device *rdev,
+                        u16 limit)
+{
+       int ret;
+       const u8 *int_vect;
+       u16 int_vect_start_address;
+       u16 int_vect_size;
+       const u8 *ucode_data;
+       u16 ucode_start_address;
+       u16 ucode_size;
+
+       if (!rdev->smc_fw)
+               return -EINVAL;
+
+       rv770_clear_smc_sram(rdev, limit);
+
+       switch (rdev->family) {
+       case CHIP_RV770:
+               ucode_start_address = RV770_SMC_UCODE_START;
+               ucode_size = RV770_SMC_UCODE_SIZE;
+               int_vect = (const u8 *)&rv770_smc_int_vectors;
+               int_vect_start_address = RV770_SMC_INT_VECTOR_START;
+               int_vect_size = RV770_SMC_INT_VECTOR_SIZE;
+               break;
+       case CHIP_RV730:
+               ucode_start_address = RV730_SMC_UCODE_START;
+               ucode_size = RV730_SMC_UCODE_SIZE;
+               int_vect = (const u8 *)&rv730_smc_int_vectors;
+               int_vect_start_address = RV730_SMC_INT_VECTOR_START;
+               int_vect_size = RV730_SMC_INT_VECTOR_SIZE;
+               break;
+       case CHIP_RV710:
+               ucode_start_address = RV710_SMC_UCODE_START;
+               ucode_size = RV710_SMC_UCODE_SIZE;
+               int_vect = (const u8 *)&rv710_smc_int_vectors;
+               int_vect_start_address = RV710_SMC_INT_VECTOR_START;
+               int_vect_size = RV710_SMC_INT_VECTOR_SIZE;
+               break;
+       case CHIP_RV740:
+               ucode_start_address = RV740_SMC_UCODE_START;
+               ucode_size = RV740_SMC_UCODE_SIZE;
+               int_vect = (const u8 *)&rv740_smc_int_vectors;
+               int_vect_start_address = RV740_SMC_INT_VECTOR_START;
+               int_vect_size = RV740_SMC_INT_VECTOR_SIZE;
+               break;
+       default:
+               DRM_ERROR("unknown asic in smc ucode loader\n");
+               BUG();
+       }
+
+       /* load the ucode */
+       ucode_data = (const u8 *)rdev->smc_fw->data;
+       ret = rv770_copy_bytes_to_smc(rdev, ucode_start_address,
+                                     ucode_data, ucode_size, limit);
+       if (ret)
+               return ret;
+
+       /* set up the int vectors */
+       ret = rv770_program_interrupt_vectors(rdev, int_vect_start_address,
+                                             int_vect, int_vect_size);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+int rv770_read_smc_sram_dword(struct radeon_device *rdev,
+                             u16 smc_address, u32 *value, u16 limit)
+{
+       int ret;
+
+       ret = rv770_set_smc_sram_address(rdev, smc_address, limit);
+       if (ret)
+               return ret;
+
+       *value = RREG32(SMC_SRAM_DATA);
+
+       return 0;
+}
+
+int rv770_write_smc_sram_dword(struct radeon_device *rdev,
+                              u16 smc_address, u32 value, u16 limit)
+{
+       int ret;
+
+       ret = rv770_set_smc_sram_address(rdev, smc_address, limit);
+       if (ret)
+               return ret;
+
+       WREG32(SMC_SRAM_DATA, value);
+
+       return 0;
+}
diff --git a/drivers/gpu/drm/radeon/rv770_smc.h 
b/drivers/gpu/drm/radeon/rv770_smc.h
new file mode 100644
index 0000000..bdb652c
--- /dev/null
+++ b/drivers/gpu/drm/radeon/rv770_smc.h
@@ -0,0 +1,208 @@
+/*
+ * Copyright 2011 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+#ifndef __RV770_SMC_H__
+#define __RV770_SMC_H__
+
+#include "ppsmc.h"
+
+#pragma pack(push, 1)
+
+#define RV770_SMC_TABLE_ADDRESS 0xB000
+
+#define RV770_SMC_PERFORMANCE_LEVELS_PER_SWSTATE    3
+
+struct RV770_SMC_SCLK_VALUE
+{
+    uint32_t        vCG_SPLL_FUNC_CNTL;
+    uint32_t        vCG_SPLL_FUNC_CNTL_2;
+    uint32_t        vCG_SPLL_FUNC_CNTL_3;
+    uint32_t        vCG_SPLL_SPREAD_SPECTRUM;
+    uint32_t        vCG_SPLL_SPREAD_SPECTRUM_2;
+    uint32_t        sclk_value;
+};
+
+typedef struct RV770_SMC_SCLK_VALUE RV770_SMC_SCLK_VALUE;
+
+struct RV770_SMC_MCLK_VALUE
+{
+    uint32_t        vMPLL_AD_FUNC_CNTL;
+    uint32_t        vMPLL_AD_FUNC_CNTL_2;
+    uint32_t        vMPLL_DQ_FUNC_CNTL;
+    uint32_t        vMPLL_DQ_FUNC_CNTL_2;
+    uint32_t        vMCLK_PWRMGT_CNTL;
+    uint32_t        vDLL_CNTL;
+    uint32_t        vMPLL_SS;
+    uint32_t        vMPLL_SS2;
+    uint32_t        mclk_value;
+};
+
+typedef struct RV770_SMC_MCLK_VALUE RV770_SMC_MCLK_VALUE;
+
+
+struct RV730_SMC_MCLK_VALUE
+{
+    uint32_t        vMCLK_PWRMGT_CNTL;
+    uint32_t        vDLL_CNTL;
+    uint32_t        vMPLL_FUNC_CNTL;
+    uint32_t        vMPLL_FUNC_CNTL2;
+    uint32_t        vMPLL_FUNC_CNTL3;
+    uint32_t        vMPLL_SS;
+    uint32_t        vMPLL_SS2;
+    uint32_t        mclk_value;
+};
+
+typedef struct RV730_SMC_MCLK_VALUE RV730_SMC_MCLK_VALUE;
+
+struct RV770_SMC_VOLTAGE_VALUE
+{
+    uint16_t             value;
+    uint8_t              index;
+    uint8_t              padding;
+};
+
+typedef struct RV770_SMC_VOLTAGE_VALUE RV770_SMC_VOLTAGE_VALUE;
+
+union RV7XX_SMC_MCLK_VALUE
+{
+    RV770_SMC_MCLK_VALUE    mclk770;
+    RV730_SMC_MCLK_VALUE    mclk730;
+};
+
+typedef union RV7XX_SMC_MCLK_VALUE RV7XX_SMC_MCLK_VALUE, 
*LPRV7XX_SMC_MCLK_VALUE;
+
+struct RV770_SMC_HW_PERFORMANCE_LEVEL
+{
+    uint8_t                 arbValue;
+    union{
+        uint8_t             seqValue;
+        uint8_t             ACIndex;
+    };
+    uint8_t                 displayWatermark;
+    uint8_t                 gen2PCIE;
+    uint8_t                 gen2XSP;
+    uint8_t                 backbias;
+    uint8_t                 strobeMode;
+    uint8_t                 mcFlags;
+    uint32_t                aT;
+    uint32_t                bSP;
+    RV770_SMC_SCLK_VALUE    sclk;
+    RV7XX_SMC_MCLK_VALUE    mclk;
+    RV770_SMC_VOLTAGE_VALUE vddc;
+    RV770_SMC_VOLTAGE_VALUE mvdd;
+    RV770_SMC_VOLTAGE_VALUE vddci;
+    uint8_t                 reserved1;
+    uint8_t                 reserved2;
+    uint8_t                 stateFlags;
+    uint8_t                 padding;
+};
+
+#define SMC_STROBE_RATIO    0x0F
+#define SMC_STROBE_ENABLE   0x10
+
+#define SMC_MC_EDC_RD_FLAG  0x01
+#define SMC_MC_EDC_WR_FLAG  0x02
+#define SMC_MC_RTT_ENABLE   0x04
+#define SMC_MC_STUTTER_EN   0x08
+
+typedef struct RV770_SMC_HW_PERFORMANCE_LEVEL RV770_SMC_HW_PERFORMANCE_LEVEL;
+
+struct RV770_SMC_SWSTATE
+{
+    uint8_t           flags;
+    uint8_t           padding1;
+    uint8_t           padding2;
+    uint8_t           padding3;
+    RV770_SMC_HW_PERFORMANCE_LEVEL 
levels[RV770_SMC_PERFORMANCE_LEVELS_PER_SWSTATE];
+};
+
+typedef struct RV770_SMC_SWSTATE RV770_SMC_SWSTATE;
+
+#define RV770_SMC_VOLTAGEMASK_VDDC 0
+#define RV770_SMC_VOLTAGEMASK_MVDD 1
+#define RV770_SMC_VOLTAGEMASK_VDDCI 2
+#define RV770_SMC_VOLTAGEMASK_MAX  4
+
+struct RV770_SMC_VOLTAGEMASKTABLE
+{
+    uint8_t  highMask[RV770_SMC_VOLTAGEMASK_MAX];
+    uint32_t lowMask[RV770_SMC_VOLTAGEMASK_MAX];
+};
+
+typedef struct RV770_SMC_VOLTAGEMASKTABLE RV770_SMC_VOLTAGEMASKTABLE;
+
+#define MAX_NO_VREG_STEPS 32
+
+struct RV770_SMC_STATETABLE
+{
+    uint8_t             thermalProtectType;
+    uint8_t             systemFlags;
+    uint8_t             maxVDDCIndexInPPTable;
+    uint8_t             extraFlags;
+    uint8_t             highSMIO[MAX_NO_VREG_STEPS];
+    uint32_t            lowSMIO[MAX_NO_VREG_STEPS];
+    RV770_SMC_VOLTAGEMASKTABLE voltageMaskTable;
+    RV770_SMC_SWSTATE   initialState;
+    RV770_SMC_SWSTATE   ACPIState;
+    RV770_SMC_SWSTATE   driverState;
+    RV770_SMC_SWSTATE   ULVState;
+};
+
+typedef struct RV770_SMC_STATETABLE RV770_SMC_STATETABLE;
+
+#define PPSMC_STATEFLAG_AUTO_PULSE_SKIP 0x01
+
+#pragma pack(pop)
+
+#define RV770_SMC_SOFT_REGISTERS_START        0x104
+
+#define RV770_SMC_SOFT_REGISTER_mclk_chg_timeout        0x0
+#define RV770_SMC_SOFT_REGISTER_baby_step_timer         0x8
+#define RV770_SMC_SOFT_REGISTER_delay_bbias             0xC
+#define RV770_SMC_SOFT_REGISTER_delay_vreg              0x10
+#define RV770_SMC_SOFT_REGISTER_delay_acpi              0x2C
+#define RV770_SMC_SOFT_REGISTER_seq_index               0x64
+#define RV770_SMC_SOFT_REGISTER_mvdd_chg_time           0x68
+#define RV770_SMC_SOFT_REGISTER_mclk_switch_lim         0x78
+#define RV770_SMC_SOFT_REGISTER_mc_block_delay          0x90
+#define RV770_SMC_SOFT_REGISTER_is_asic_lombok          0xA0
+
+int rv770_set_smc_sram_address(struct radeon_device *rdev,
+                              u16 smc_address, u16 limit);
+int rv770_copy_bytes_to_smc(struct radeon_device *rdev,
+                           u16 smc_start_address, const u8 *src,
+                           u16 byte_count, u16 limit);
+void rv770_start_smc(struct radeon_device *rdev);
+void rv770_reset_smc(struct radeon_device *rdev);
+void rv770_stop_smc_clock(struct radeon_device *rdev);
+void rv770_start_smc_clock(struct radeon_device *rdev);
+bool rv770_is_smc_running(struct radeon_device *rdev);
+PPSMC_Result rv770_send_msg_to_smc(struct radeon_device *rdev, PPSMC_Msg msg);
+PPSMC_Result rv770_wait_for_smc_inactive(struct radeon_device *rdev);
+int rv770_read_smc_sram_dword(struct radeon_device *rdev,
+                             u16 smc_address, u32 *value, u16 limit);
+int rv770_write_smc_sram_dword(struct radeon_device *rdev,
+                              u16 smc_address, u32 value, u16 limit);
+int rv770_load_smc_ucode(struct radeon_device *rdev,
+                        u16 limit);
+
+#endif
diff --git a/drivers/gpu/drm/radeon/rv770d.h b/drivers/gpu/drm/radeon/rv770d.h
index 85b1626..784eeaf 100644
--- a/drivers/gpu/drm/radeon/rv770d.h
+++ b/drivers/gpu/drm/radeon/rv770d.h
@@ -62,6 +62,242 @@
 #      define UPLL_FB_DIV(x)                           ((x) << 0)
 #      define UPLL_FB_DIV_MASK                         0x01FFFFFF

+/* pm registers */
+#define        SMC_SRAM_ADDR                                   0x200
+#define                SMC_SRAM_AUTO_INC_DIS                           (1 << 
16)
+#define        SMC_SRAM_DATA                                   0x204
+#define        SMC_IO                                          0x208
+#define                SMC_RST_N                                       (1 << 0)
+#define                SMC_STOP_MODE                                   (1 << 2)
+#define                SMC_CLK_EN                                      (1 << 
11)
+#define        SMC_MSG                                         0x20c
+#define                HOST_SMC_MSG(x)                                 ((x) << 
0)
+#define                HOST_SMC_MSG_MASK                               (0xff 
<< 0)
+#define                HOST_SMC_MSG_SHIFT                              0
+#define                HOST_SMC_RESP(x)                                ((x) << 
8)
+#define                HOST_SMC_RESP_MASK                              (0xff 
<< 8)
+#define                HOST_SMC_RESP_SHIFT                             8
+#define                SMC_HOST_MSG(x)                                 ((x) << 
16)
+#define                SMC_HOST_MSG_MASK                               (0xff 
<< 16)
+#define                SMC_HOST_MSG_SHIFT                              16
+#define                SMC_HOST_RESP(x)                                ((x) << 
24)
+#define                SMC_HOST_RESP_MASK                              (0xff 
<< 24)
+#define                SMC_HOST_RESP_SHIFT                             24
+
+#define        SMC_ISR_FFD8_FFDB                               0x218
+
+#define        CG_SPLL_FUNC_CNTL                               0x600
+#define                SPLL_RESET                              (1 << 0)
+#define                SPLL_SLEEP                              (1 << 1)
+#define                SPLL_DIVEN                              (1 << 2)
+#define                SPLL_BYPASS_EN                          (1 << 3)
+#define                SPLL_REF_DIV(x)                         ((x) << 4)
+#define                SPLL_REF_DIV_MASK                       (0x3f << 4)
+#define                SPLL_HILEN(x)                           ((x) << 12)
+#define                SPLL_HILEN_MASK                         (0xf << 12)
+#define                SPLL_LOLEN(x)                           ((x) << 16)
+#define                SPLL_LOLEN_MASK                         (0xf << 16)
+#define        CG_SPLL_FUNC_CNTL_2                             0x604
+#define                SCLK_MUX_SEL(x)                         ((x) << 0)
+#define                SCLK_MUX_SEL_MASK                       (0x1ff << 0)
+#define        CG_SPLL_FUNC_CNTL_3                             0x608
+#define                SPLL_FB_DIV(x)                          ((x) << 0)
+#define                SPLL_FB_DIV_MASK                        (0x3ffffff << 0)
+#define                SPLL_DITHEN                             (1 << 28)
+
+#define        SPLL_CNTL_MODE                                  0x610
+#define                SPLL_DIV_SYNC                           (1 << 5)
+
+#define        MPLL_AD_FUNC_CNTL                               0x624
+#define                CLKF(x)                                 ((x) << 0)
+#define                CLKF_MASK                               (0x7f << 0)
+#define                CLKR(x)                                 ((x) << 7)
+#define                CLKR_MASK                               (0x1f << 7)
+#define                CLKFRAC(x)                              ((x) << 12)
+#define                CLKFRAC_MASK                            (0x1f << 12)
+#define                YCLK_POST_DIV(x)                        ((x) << 17)
+#define                YCLK_POST_DIV_MASK                      (3 << 17)
+#define                IBIAS(x)                                ((x) << 20)
+#define                IBIAS_MASK                              (0x3ff << 20)
+#define                RESET                                   (1 << 30)
+#define                PDNB                                    (1 << 31)
+#define        MPLL_AD_FUNC_CNTL_2                             0x628
+#define                BYPASS                                  (1 << 19)
+#define                BIAS_GEN_PDNB                           (1 << 24)
+#define                RESET_EN                                (1 << 25)
+#define                VCO_MODE                                (1 << 29)
+#define        MPLL_DQ_FUNC_CNTL                               0x62c
+#define        MPLL_DQ_FUNC_CNTL_2                             0x630
+
+#define GENERAL_PWRMGT                                  0x63c
+#       define GLOBAL_PWRMGT_EN                         (1 << 0)
+#       define STATIC_PM_EN                             (1 << 1)
+#       define THERMAL_PROTECTION_DIS                   (1 << 2)
+#       define THERMAL_PROTECTION_TYPE                  (1 << 3)
+#       define ENABLE_GEN2PCIE                          (1 << 4)
+#       define ENABLE_GEN2XSP                           (1 << 5)
+#       define SW_SMIO_INDEX(x)                         ((x) << 6)
+#       define SW_SMIO_INDEX_MASK                       (3 << 6)
+#       define SW_SMIO_INDEX_SHIFT                      6
+#       define LOW_VOLT_D2_ACPI                         (1 << 8)
+#       define LOW_VOLT_D3_ACPI                         (1 << 9)
+#       define VOLT_PWRMGT_EN                           (1 << 10)
+#       define BACKBIAS_PAD_EN                          (1 << 18)
+#       define BACKBIAS_VALUE                           (1 << 19)
+#       define DYN_SPREAD_SPECTRUM_EN                   (1 << 23)
+#       define AC_DC_SW                                 (1 << 24)
+
+#define CG_TPC                                            0x640
+#define SCLK_PWRMGT_CNTL                                  0x644
+#       define SCLK_PWRMGT_OFF                            (1 << 0)
+#       define SCLK_LOW_D1                                (1 << 1)
+#       define FIR_RESET                                  (1 << 4)
+#       define FIR_FORCE_TREND_SEL                        (1 << 5)
+#       define FIR_TREND_MODE                             (1 << 6)
+#       define DYN_GFX_CLK_OFF_EN                         (1 << 7)
+#       define GFX_CLK_FORCE_ON                           (1 << 8)
+#       define GFX_CLK_REQUEST_OFF                        (1 << 9)
+#       define GFX_CLK_FORCE_OFF                          (1 << 10)
+#       define GFX_CLK_OFF_ACPI_D1                        (1 << 11)
+#       define GFX_CLK_OFF_ACPI_D2                        (1 << 12)
+#       define GFX_CLK_OFF_ACPI_D3                        (1 << 13)
+#define        MCLK_PWRMGT_CNTL                                0x648
+#       define DLL_SPEED(x)                            ((x) << 0)
+#       define DLL_SPEED_MASK                          (0x1f << 0)
+#       define MPLL_PWRMGT_OFF                          (1 << 5)
+#       define DLL_READY                                (1 << 6)
+#       define MC_INT_CNTL                              (1 << 7)
+#       define MRDCKA0_SLEEP                            (1 << 8)
+#       define MRDCKA1_SLEEP                            (1 << 9)
+#       define MRDCKB0_SLEEP                            (1 << 10)
+#       define MRDCKB1_SLEEP                            (1 << 11)
+#       define MRDCKC0_SLEEP                            (1 << 12)
+#       define MRDCKC1_SLEEP                            (1 << 13)
+#       define MRDCKD0_SLEEP                            (1 << 14)
+#       define MRDCKD1_SLEEP                            (1 << 15)
+#       define MRDCKA0_RESET                            (1 << 16)
+#       define MRDCKA1_RESET                            (1 << 17)
+#       define MRDCKB0_RESET                            (1 << 18)
+#       define MRDCKB1_RESET                            (1 << 19)
+#       define MRDCKC0_RESET                            (1 << 20)
+#       define MRDCKC1_RESET                            (1 << 21)
+#       define MRDCKD0_RESET                            (1 << 22)
+#       define MRDCKD1_RESET                            (1 << 23)
+#       define DLL_READY_READ                           (1 << 24)
+#       define USE_DISPLAY_GAP                          (1 << 25)
+#       define USE_DISPLAY_URGENT_NORMAL                (1 << 26)
+#       define MPLL_TURNOFF_D2                          (1 << 28)
+#define        DLL_CNTL                                        0x64c
+#       define MRDCKA0_BYPASS                           (1 << 24)
+#       define MRDCKA1_BYPASS                           (1 << 25)
+#       define MRDCKB0_BYPASS                           (1 << 26)
+#       define MRDCKB1_BYPASS                           (1 << 27)
+#       define MRDCKC0_BYPASS                           (1 << 28)
+#       define MRDCKC1_BYPASS                           (1 << 29)
+#       define MRDCKD0_BYPASS                           (1 << 30)
+#       define MRDCKD1_BYPASS                           (1 << 31)
+
+#define MPLL_TIME                                         0x654
+#       define MPLL_LOCK_TIME(x)                       ((x) << 0)
+#       define MPLL_LOCK_TIME_MASK                     (0xffff << 0)
+#       define MPLL_RESET_TIME(x)                      ((x) << 16)
+#       define MPLL_RESET_TIME_MASK                    (0xffff << 16)
+
+#define CG_CLKPIN_CNTL                                    0x660
+#       define MUX_TCLK_TO_XCLK                           (1 << 8)
+#       define XTALIN_DIVIDE                              (1 << 9)
+
+#define S0_VID_LOWER_SMIO_CNTL                            0x678
+#define S1_VID_LOWER_SMIO_CNTL                            0x67c
+#define S2_VID_LOWER_SMIO_CNTL                            0x680
+#define S3_VID_LOWER_SMIO_CNTL                            0x684
+
+#define CG_FTV                                            0x690
+#define CG_FFCT_0                                         0x694
+#       define UTC_0(x)                                   ((x) << 0)
+#       define UTC_0_MASK                                 (0x3ff << 0)
+#       define DTC_0(x)                                   ((x) << 10)
+#       define DTC_0_MASK                                 (0x3ff << 10)
+
+#define CG_BSP                                          0x6d0
+#       define BSP(x)                                  ((x) << 0)
+#       define BSP_MASK                                        (0xffff << 0)
+#       define BSU(x)                                  ((x) << 16)
+#       define BSU_MASK                                        (0xf << 16)
+#define CG_AT                                           0x6d4
+#       define CG_R(x)                                 ((x) << 0)
+#       define CG_R_MASK                               (0xffff << 0)
+#       define CG_L(x)                                 ((x) << 16)
+#       define CG_L_MASK                               (0xffff << 16)
+#define CG_GIT                                          0x6d8
+#       define CG_GICST(x)                              ((x) << 0)
+#       define CG_GICST_MASK                            (0xffff << 0)
+#       define CG_GIPOT(x)                              ((x) << 16)
+#       define CG_GIPOT_MASK                            (0xffff << 16)
+
+#define CG_SSP                                            0x6e8
+#       define SST(x)                                     ((x) << 0)
+#       define SST_MASK                                   (0xffff << 0)
+#       define SSTU(x)                                    ((x) << 16)
+#       define SSTU_MASK                                  (0xf << 16)
+
+#define CG_DISPLAY_GAP_CNTL                               0x714
+#       define DISP1_GAP(x)                               ((x) << 0)
+#       define DISP1_GAP_MASK                             (3 << 0)
+#       define DISP2_GAP(x)                               ((x) << 2)
+#       define DISP2_GAP_MASK                             (3 << 2)
+#       define VBI_TIMER_COUNT(x)                         ((x) << 4)
+#       define VBI_TIMER_COUNT_MASK                       (0x3fff << 4)
+#       define VBI_TIMER_UNIT(x)                          ((x) << 20)
+#       define VBI_TIMER_UNIT_MASK                        (7 << 20)
+#       define DISP1_GAP_MCHG(x)                          ((x) << 24)
+#       define DISP1_GAP_MCHG_MASK                        (3 << 24)
+#       define DISP2_GAP_MCHG(x)                          ((x) << 26)
+#       define DISP2_GAP_MCHG_MASK                        (3 << 26)
+
+#define        CG_SPLL_SPREAD_SPECTRUM                         0x790
+#define                SSEN                                    (1 << 0)
+#define                CLKS(x)                                 ((x) << 4)
+#define                CLKS_MASK                               (0xfff << 4)
+#define        CG_SPLL_SPREAD_SPECTRUM_2                       0x794
+#define                CLKV(x)                                 ((x) << 0)
+#define                CLKV_MASK                               (0x3ffffff << 0)
+#define        CG_MPLL_SPREAD_SPECTRUM                         0x798
+#define CG_UPLL_SPREAD_SPECTRUM                                0x79c
+#      define SSEN_MASK                                0x00000001
+
+#define CG_CGTT_LOCAL_0                                   0x7d0
+#define CG_CGTT_LOCAL_1                                   0x7d4
+
+#define BIOS_SCRATCH_4                                    0x1734
+
+#define MC_SEQ_MISC0                                      0x2a00
+#define         MC_SEQ_MISC0_GDDR5_SHIFT                  28
+#define         MC_SEQ_MISC0_GDDR5_MASK                   0xf0000000
+#define         MC_SEQ_MISC0_GDDR5_VALUE                  5
+
+#define MC_ARB_SQM_RATIO                                  0x2770
+#define                STATE0(x)                               ((x) << 0)
+#define                STATE0_MASK                             (0xff << 0)
+#define                STATE1(x)                               ((x) << 8)
+#define                STATE1_MASK                             (0xff << 8)
+#define                STATE2(x)                               ((x) << 16)
+#define                STATE2_MASK                             (0xff << 16)
+#define                STATE3(x)                               ((x) << 24)
+#define                STATE3_MASK                             (0xff << 24)
+
+#define        MC_ARB_RFSH_RATE                                0x27b0
+#define                POWERMODE0(x)                           ((x) << 0)
+#define                POWERMODE0_MASK                         (0xff << 0)
+#define                POWERMODE1(x)                           ((x) << 8)
+#define                POWERMODE1_MASK                         (0xff << 8)
+#define                POWERMODE2(x)                           ((x) << 16)
+#define                POWERMODE2_MASK                         (0xff << 16)
+#define                POWERMODE3(x)                           ((x) << 24)
+#define                POWERMODE3_MASK                         (0xff << 24)
+
+#define CGTS_SM_CTRL_REG                                  0x9150
+
 /* Registers */
 #define        CB_COLOR0_BASE                                  0x28040
 #define        CB_COLOR1_BASE                                  0x28044
@@ -86,8 +322,8 @@
 #define        CONFIG_MEMSIZE                                  0x5428

 #define        CP_ME_CNTL                                      0x86D8
-#define                CP_ME_HALT                                      (1<<28)
-#define                CP_PFP_HALT                                     (1<<26)
+#define                CP_ME_HALT                                      (1 << 
28)
+#define                CP_PFP_HALT                                     (1 << 
26)
 #define        CP_ME_RAM_DATA                                  0xC160
 #define        CP_ME_RAM_RADDR                                 0xC158
 #define        CP_ME_RAM_WADDR                                 0xC15C
@@ -157,9 +393,22 @@
 #define                GUI_ACTIVE                                      (1<<31)
 #define        GRBM_STATUS2                                    0x8014

-#define CG_CLKPIN_CNTL                                    0x660
-#       define MUX_TCLK_TO_XCLK                           (1 << 8)
-#       define XTALIN_DIVIDE                              (1 << 9)
+#define        CG_THERMAL_CTRL                                 0x72C
+#define        DPM_EVENT_SRC(x)                        ((x) << 0)
+#define        DPM_EVENT_SRC_MASK                      (7 << 0)
+#define                DIG_THERM_DPM(x)                        ((x) << 14)
+#define                DIG_THERM_DPM_MASK                      0x003FC000
+#define                DIG_THERM_DPM_SHIFT                     14
+
+#define        CG_THERMAL_INT                                  0x734
+#define                DIG_THERM_INTH(x)                       ((x) << 8)
+#define                DIG_THERM_INTH_MASK                     0x0000FF00
+#define                DIG_THERM_INTH_SHIFT                    8
+#define                DIG_THERM_INTL(x)                       ((x) << 16)
+#define                DIG_THERM_INTL_MASK                     0x00FF0000
+#define                DIG_THERM_INTL_SHIFT                    16
+#define        THERM_INT_MASK_HIGH                     (1 << 24)
+#define        THERM_INT_MASK_LOW                      (1 << 25)

 #define        CG_MULT_THERMAL_STATUS                          0x740
 #define                ASIC_T(x)                               ((x) << 16)
@@ -662,7 +911,22 @@
 #define D1GRPH_SECONDARY_SURFACE_ADDRESS_HIGH             0x691c
 #define D2GRPH_SECONDARY_SURFACE_ADDRESS_HIGH             0x611c

-/* PCIE link stuff */
+/* PCIE indirect regs */
+#define PCIE_P_CNTL                                       0x40
+#       define P_PLL_PWRDN_IN_L1L23                       (1 << 3)
+#       define P_PLL_BUF_PDNB                             (1 << 4)
+#       define P_PLL_PDNB                                 (1 << 9)
+#       define P_ALLOW_PRX_FRONTEND_SHUTOFF               (1 << 12)
+/* PCIE PORT regs */
+#define PCIE_LC_CNTL                                      0xa0
+#       define LC_L0S_INACTIVITY(x)                       ((x) << 8)
+#       define LC_L0S_INACTIVITY_MASK                     (0xf << 8)
+#       define LC_L0S_INACTIVITY_SHIFT                    8
+#       define LC_L1_INACTIVITY(x)                        ((x) << 12)
+#       define LC_L1_INACTIVITY_MASK                      (0xf << 12)
+#       define LC_L1_INACTIVITY_SHIFT                     12
+#       define LC_PMI_TO_L1_DIS                           (1 << 16)
+#       define LC_ASPM_TO_L1_DIS                          (1 << 24)
 #define PCIE_LC_TRAINING_CNTL                             0xa1 /* PCIE_P */
 #define PCIE_LC_LINK_WIDTH_CNTL                           0xa2 /* PCIE_P */
 #       define LC_LINK_WIDTH_SHIFT                        0
@@ -690,6 +954,9 @@
 #       define LC_SPEED_CHANGE_ATTEMPTS_ALLOWED_MASK      (0x3 << 8)
 #       define LC_SPEED_CHANGE_ATTEMPTS_ALLOWED_SHIFT     3
 #       define LC_CURRENT_DATA_RATE                       (1 << 11)
+#       define LC_HW_VOLTAGE_IF_CONTROL(x)                ((x) << 12)
+#       define LC_HW_VOLTAGE_IF_CONTROL_MASK              (3 << 12)
+#       define LC_HW_VOLTAGE_IF_CONTROL_SHIFT             12
 #       define LC_VOLTAGE_TIMER_SEL_MASK                  (0xf << 14)
 #       define LC_CLR_FAILED_SPD_CHANGE_CNT               (1 << 21)
 #       define LC_OTHER_SIDE_EVER_SENT_GEN2               (1 << 23)
-- 
1.7.7.5

Reply via email to