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

Commit 0c67df48 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/pm: add some checks for PX 



I.e., doesn't make sense to change power states or check the
temperature when the asic is powered off.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 10f950f6

drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

+20 −1
Original line number Diff line number Diff line
@@ -113,6 +113,10 @@ static ssize_t amdgpu_get_dpm_forced_performance_level(struct device *dev, 
	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = ddev->dev_private;



	if  ((adev->flags & AMD_IS_PX) &&

	     (ddev->switch_power_state != DRM_SWITCH_POWER_ON))

		return snprintf(buf, PAGE_SIZE, "off\n");



	if (adev->pp_enabled) {

		enum amd_dpm_forced_level level;
@@ -140,6 +144,11 @@ static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev, 
	enum amdgpu_dpm_forced_level level;

	int ret = 0;



	/* Can't force performance level when the card is off */

	if  ((adev->flags & AMD_IS_PX) &&

	     (ddev->switch_power_state != DRM_SWITCH_POWER_ON))

		return -EINVAL;



	if (strncmp("low", buf, strlen("low")) == 0) {

		level = AMDGPU_DPM_FORCED_LEVEL_LOW;

	} else if (strncmp("high", buf, strlen("high")) == 0) {
@@ -181,8 +190,14 @@ static ssize_t amdgpu_hwmon_show_temp(struct device *dev, 
				      char *buf)

{

	struct amdgpu_device *adev = dev_get_drvdata(dev);

	struct drm_device *ddev = adev->ddev;

	int temp;



	/* Can't get temperature when the card is off */

	if  ((adev->flags & AMD_IS_PX) &&

	     (ddev->switch_power_state != DRM_SWITCH_POWER_ON))

		return -EINVAL;



	if (!adev->pp_enabled && !adev->pm.funcs->get_temperature)

		temp = 0;

	else
@@ -846,12 +861,16 @@ static int amdgpu_debugfs_pm_info(struct seq_file *m, void *data) 
	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	struct amdgpu_device *adev = dev->dev_private;

	struct drm_device *ddev = adev->ddev;



	if (!adev->pm.dpm_enabled) {

		seq_printf(m, "dpm not enabled\n");

		return 0;

	}

	if (adev->pp_enabled) {

	if  ((adev->flags & AMD_IS_PX) &&

	     (ddev->switch_power_state != DRM_SWITCH_POWER_ON)) {

		seq_printf(m, "PX asic powered off\n");

	} else if (adev->pp_enabled) {

		amdgpu_dpm_debugfs_print_current_performance_level(adev, m);

	} else {

		mutex_lock(&adev->pm.mutex);