1 files changed, 33 insertions, 19 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index ee738a524639..f30b8426eee2 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -603,7 +603,6 @@ static const struct attribute_group *hwmon_groups[] = {
 static int radeon_hwmon_init(struct radeon_device *rdev)
 {
         int err = 0;
-        struct device *hwmon_dev;
 
         switch (rdev->pm.int_thermal_type) {
         case THERMAL_TYPE_RV6XX:
@@ -616,11 +615,11 @@ static int radeon_hwmon_init(struct radeon_device *rdev)
         case THERMAL_TYPE_KV:
                 if (rdev->asic->pm.get_temperature == NULL)
                         return err;
-                hwmon_dev = hwmon_device_register_with_groups(rdev->dev,
-                                                              "radeon", rdev,
-                                                              hwmon_groups);
-                if (IS_ERR(hwmon_dev)) {
-                        err = PTR_ERR(hwmon_dev);
+                rdev->pm.int_hwmon_dev = hwmon_device_register_with_groups(rdev->dev,
+                                                                           "radeon", rdev,
+                                                                           hwmon_groups);
+                if (IS_ERR(rdev->pm.int_hwmon_dev)) {
+                        err = PTR_ERR(rdev->pm.int_hwmon_dev);
                         dev_err(rdev->dev,
                                 "Unable to register hwmon device: %d\n", err);
                 }
@@ -632,6 +631,12 @@ static int radeon_hwmon_init(struct radeon_device *rdev)
         return err;
 }
 
+static void radeon_hwmon_fini(struct radeon_device *rdev)
+{
+        if (rdev->pm.int_hwmon_dev)
+                hwmon_device_unregister(rdev->pm.int_hwmon_dev);
+}
+
 static void radeon_dpm_thermal_work_handler(struct work_struct *work)
 {
         struct radeon_device *rdev =
@@ -1257,6 +1262,7 @@ int radeon_pm_init(struct radeon_device *rdev)
         case CHIP_RV670:
         case CHIP_RS780:
         case CHIP_RS880:
+        case CHIP_RV770:
         case CHIP_BARTS:
         case CHIP_TURKS:
         case CHIP_CAICOS:
@@ -1273,7 +1279,6 @@ int radeon_pm_init(struct radeon_device *rdev)
                 else
                         rdev->pm.pm_method = PM_METHOD_PROFILE;
                 break;
-        case CHIP_RV770:
         case CHIP_RV730:
         case CHIP_RV710:
         case CHIP_RV740:
@@ -1295,6 +1300,7 @@ int radeon_pm_init(struct radeon_device *rdev)
         case CHIP_KABINI:
         case CHIP_KAVERI:
         case CHIP_HAWAII:
+        case CHIP_MULLINS:
                 /* DPM requires the RLC, RV770+ dGPU requires SMC */
                 if (!rdev->rlc_fw)
                         rdev->pm.pm_method = PM_METHOD_PROFILE;
@@ -1353,6 +1359,8 @@ static void radeon_pm_fini_old(struct radeon_device *rdev)
                 device_remove_file(rdev->dev, &dev_attr_power_method);
         }
 
+        radeon_hwmon_fini(rdev);
+
         if (rdev->pm.power_state)
                 kfree(rdev->pm.power_state);
 }
@@ -1372,6 +1380,8 @@ static void radeon_pm_fini_dpm(struct radeon_device *rdev)
         }
         radeon_dpm_fini(rdev);
 
+        radeon_hwmon_fini(rdev);
+
         if (rdev->pm.power_state)
                 kfree(rdev->pm.power_state);
 }
@@ -1397,12 +1407,14 @@ static void radeon_pm_compute_clocks_old(struct radeon_device *rdev)
 
         rdev->pm.active_crtcs = 0;
         rdev->pm.active_crtc_count = 0;
-        list_for_each_entry(crtc,
-                &ddev->mode_config.crtc_list, head) {
-                radeon_crtc = to_radeon_crtc(crtc);
-                if (radeon_crtc->enabled) {
-                        rdev->pm.active_crtcs |= (1 << radeon_crtc->crtc_id);
-                        rdev->pm.active_crtc_count++;
+        if (rdev->num_crtc && rdev->mode_info.mode_config_initialized) {
+                list_for_each_entry(crtc,
+                                    &ddev->mode_config.crtc_list, head) {
+                        radeon_crtc = to_radeon_crtc(crtc);
+                        if (radeon_crtc->enabled) {
+                                rdev->pm.active_crtcs |= (1 << radeon_crtc->crtc_id);
+                                rdev->pm.active_crtc_count++;
+                        }
                 }
         }
 
@@ -1469,12 +1481,14 @@ static void radeon_pm_compute_clocks_dpm(struct radeon_device *rdev)
         /* update active crtc counts */
         rdev->pm.dpm.new_active_crtcs = 0;
         rdev->pm.dpm.new_active_crtc_count = 0;
-        list_for_each_entry(crtc,
-                &ddev->mode_config.crtc_list, head) {
-                radeon_crtc = to_radeon_crtc(crtc);
-                if (crtc->enabled) {
-                        rdev->pm.dpm.new_active_crtcs |= (1 << radeon_crtc->crtc_id);
-                        rdev->pm.dpm.new_active_crtc_count++;
+        if (rdev->num_crtc && rdev->mode_info.mode_config_initialized) {
+                list_for_each_entry(crtc,
+                                    &ddev->mode_config.crtc_list, head) {
+                        radeon_crtc = to_radeon_crtc(crtc);
+                        if (crtc->enabled) {
+                                rdev->pm.dpm.new_active_crtcs |= (1 << radeon_crtc->crtc_id);
+                                rdev->pm.dpm.new_active_crtc_count++;
+                        }
                 }
         }