Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2893d28 authored by Alex Deucher's avatar Alex Deucher Committed by Sasha Levin
Browse files

drm/radeon: add pm sysfs files late 



[ Upstream commit 51a4726b04e880fdd9b4e0e58b13f70b0a68a7f5 ]

They were added relatively early in the driver init process
which meant that in some cases the driver was not finished
initializing before external tools tried to use them which
could result in a crash depending on the timing.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent af26f0b3

drivers/gpu/drm/radeon/radeon_display.c

+2 −12
Original line number Diff line number Diff line
@@ -1619,18 +1619,8 @@ int radeon_modeset_init(struct radeon_device *rdev) 
	radeon_fbdev_init(rdev);

	drm_kms_helper_poll_init(rdev->ddev);



	if (rdev->pm.dpm_enabled) {

		/* do dpm late init */

	/* do pm late init */

	ret = radeon_pm_late_init(rdev);

		if (ret) {

			rdev->pm.dpm_enabled = false;

			DRM_ERROR("radeon_pm_late_init failed, disabling dpm\n");

		}

		/* set the dpm state for PX since there won't be

		 * a modeset to call this.

		 */

		radeon_pm_compute_clocks(rdev);

	}



	return 0;

}

drivers/gpu/drm/radeon/radeon_pm.c

+38 −25
Original line number Diff line number Diff line
@@ -1192,14 +1192,6 @@ static int radeon_pm_init_old(struct radeon_device *rdev) 
	INIT_DELAYED_WORK(&rdev->pm.dynpm_idle_work, radeon_dynpm_idle_work_handler);



	if (rdev->pm.num_power_states > 1) {

		/* 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 (radeon_debugfs_pm_init(rdev)) {

			DRM_ERROR("Failed to register debugfs file for PM!\n");

		}
@@ -1257,20 +1249,6 @@ static int radeon_pm_init_dpm(struct radeon_device *rdev) 
		goto dpm_failed;

	rdev->pm.dpm_enabled = true;



	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");



	if (radeon_debugfs_pm_init(rdev)) {

		DRM_ERROR("Failed to register debugfs file for dpm!\n");

	}
@@ -1411,9 +1389,44 @@ 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) {

			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");



			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) {

			/* 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");

		}

	}

	return ret;

}