 @@ -1,39 +1,39 @@
-/*	$NetBSD: radeon_pm.c,v 1.4 2018/08/27 04:58:36 riastradh Exp $	*/
+/*	$NetBSD: radeon_pm.c,v 1.5 2018/08/27 07:50:19 riastradh Exp $	*/
 /*
  * 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: Rafał Miłecki <zajec5@gmail.com>
  *          Alex Deucher <alexdeucher@gmail.com>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_pm.c,v 1.4 2018/08/27 04:58:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_pm.c,v 1.5 2018/08/27 07:50:19 riastradh Exp $");
 #include <drm/drmP.h>
 #include "radeon.h"
 #include "avivod.h"
 #include "atom.h"
 #include "r600_dpm.h"
 #include <linux/power_supply.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #define RADEON_IDLE_LOOP_MS 100
 #define RADEON_RECLOCK_DELAY_MS 200
 #define RADEON_WAIT_VBLANK_TIMEOUT 200
 @@ -1545,68 +1545,72 @@ int radeon_pm_init(struct radeon_device
 	if (rdev->pm.pm_method == PM_METHOD_DPM)
 		return radeon_pm_init_dpm(rdev);
 	else
 		return radeon_pm_init_old(rdev);
+}
 int radeon_pm_late_init(struct radeon_device *rdev)
+{
 	int ret = 0;
 	if (rdev->pm.pm_method == PM_METHOD_DPM) {
 		if (rdev->pm.dpm_enabled) {
 #ifndef __NetBSD__		/* XXX radeon sysfs */
 			if (!rdev->pm.sysfs_initialized) {
 				ret = device_create_file(rdev->dev, &dev_attr_power_dpm_state);
 				if (ret)
 					DRM_ERROR("failed to create device file for dpm state\n");
 				ret = device_create_file(rdev->dev, &dev_attr_power_dpm_force_performance_level);
 				if (ret)
 					DRM_ERROR("failed to create device file for dpm state\n");
 				/* XXX: these are noops for dpm but are here for backwards compat */
 				ret = device_create_file(rdev->dev, &dev_attr_power_profile);
 				if (ret)
 					DRM_ERROR("failed to create device file for power profile\n");
 				ret = device_create_file(rdev->dev, &dev_attr_power_method);
 				if (ret)
 					DRM_ERROR("failed to create device file for power method\n");
 				rdev->pm.sysfs_initialized = true;
+			}
 #endif
 			mutex_lock(&rdev->pm.mutex);
 			ret = radeon_dpm_late_enable(rdev);
 			mutex_unlock(&rdev->pm.mutex);
 			if (ret) {
 				rdev->pm.dpm_enabled = false;
 				DRM_ERROR("radeon_pm_late_init failed, disabling dpm\n");
 			} else {
 				/* set the dpm state for PX since there won't be
 				 * a modeset to call this.
 				 */
 				radeon_pm_compute_clocks(rdev);
+			}
+		}
 	} else {
 		if ((rdev->pm.num_power_states > 1) &&
 		    (!rdev->pm.sysfs_initialized)) {
 #ifndef __NetBSD__	     /* XXX radeon sysfs */
 			/* where's the best place to put these? */
 			ret = device_create_file(rdev->dev, &dev_attr_power_profile);
 			if (ret)
 				DRM_ERROR("failed to create device file for power profile\n");
 			ret = device_create_file(rdev->dev, &dev_attr_power_method);
 			if (ret)
 				DRM_ERROR("failed to create device file for power method\n");
 			if (!ret)
 				rdev->pm.sysfs_initialized = true;
 #endif
+		}
+	}
 	return ret;
+}
 static void radeon_pm_fini_old(struct radeon_device *rdev)
+{
 	if (rdev->pm.num_power_states > 1) {
 		mutex_lock(&rdev->pm.mutex);
 		if (rdev->pm.pm_method == PM_METHOD_PROFILE) {
 			rdev->pm.profile = PM_PROFILE_DEFAULT;
 			radeon_pm_update_profile(rdev);
 			radeon_pm_set_clocks(rdev);