1 files changed, 21 insertions, 12 deletions

diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c
index cad89a977527..10dae4106c08 100644
--- a/drivers/gpu/drm/radeon/ci_dpm.c
+++ b/drivers/gpu/drm/radeon/ci_dpm.c
@@ -21,8 +21,10 @@
  *
  */
 
+#include <linux/firmware.h>
 #include "drmP.h"
 #include "radeon.h"
+#include "radeon_ucode.h"
 #include "cikd.h"
 #include "r600_dpm.h"
 #include "ci_dpm.h"
@@ -202,24 +204,29 @@ static void ci_initialize_powertune_defaults(struct radeon_device *rdev)
         struct ci_power_info *pi = ci_get_pi(rdev);
 
         switch (rdev->pdev->device) {
+        case 0x6649:
         case 0x6650:
+        case 0x6651:
         case 0x6658:
         case 0x665C:
+        case 0x665D:
         default:
                 pi->powertune_defaults = &defaults_bonaire_xt;
                 break;
-        case 0x6651:
-        case 0x665D:
-                pi->powertune_defaults = &defaults_bonaire_pro;
-                break;
         case 0x6640:
-                pi->powertune_defaults = &defaults_saturn_xt;
-                break;
         case 0x6641:
-                pi->powertune_defaults = &defaults_saturn_pro;
+        case 0x6646:
+        case 0x6647:
+                pi->powertune_defaults = &defaults_saturn_xt;
                 break;
         case 0x67B8:
         case 0x67B0:
+                pi->powertune_defaults = &defaults_hawaii_xt;
+                break;
+        case 0x67BA:
+        case 0x67B1:
+                pi->powertune_defaults = &defaults_hawaii_pro;
+                break;
         case 0x67A0:
         case 0x67A1:
         case 0x67A2:
@@ -228,11 +235,7 @@ static void ci_initialize_powertune_defaults(struct radeon_device *rdev)
         case 0x67AA:
         case 0x67B9:
         case 0x67BE:
-                pi->powertune_defaults = &defaults_hawaii_xt;
-                break;
-        case 0x67BA:
-        case 0x67B1:
-                pi->powertune_defaults = &defaults_hawaii_pro;
+                pi->powertune_defaults = &defaults_bonaire_xt;
                 break;
         }
 
@@ -5146,6 +5149,12 @@ int ci_dpm_init(struct radeon_device *rdev)
         pi->mclk_dpm_key_disabled = 0;
         pi->pcie_dpm_key_disabled = 0;
 
+        /* mclk dpm is unstable on some R7 260X cards with the old mc ucode */
+        if ((rdev->pdev->device == 0x6658) &&
+            (rdev->mc_fw->size == (BONAIRE_MC_UCODE_SIZE * 4))) {
+                pi->mclk_dpm_key_disabled = 1;
+        }
+
         pi->caps_sclk_ds = true;
 
         pi->mclk_strobe_mode_threshold = 40000;