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

Commit 8b2e574d authored by Eric Huang's avatar Eric Huang Committed by Alex Deucher
Browse files

drm/amdgpu: add the new common pm code to support sclk OD 



This extends OD (OverDrive) support to the non-Powerplay code paths.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarEric Huang <JinHuiEric.Huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c85e299f

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -1562,6 +1562,8 @@ struct amdgpu_dpm_funcs { 
	int (*get_fan_speed_percent)(struct amdgpu_device *adev, u32 *speed);

	int (*get_fan_speed_percent)(struct amdgpu_device *adev, u32 *speed);

	int (*force_clock_level)(struct amdgpu_device *adev, enum pp_clock_type type, uint32_t mask);

	int (*force_clock_level)(struct amdgpu_device *adev, enum pp_clock_type type, uint32_t mask);

	int (*print_clock_levels)(struct amdgpu_device *adev, enum pp_clock_type type, char *buf);

	int (*print_clock_levels)(struct amdgpu_device *adev, enum pp_clock_type type, char *buf);

	int (*get_sclk_od)(struct amdgpu_device *adev);

	int (*set_sclk_od)(struct amdgpu_device *adev, uint32_t value);

};

};





struct amdgpu_dpm {

struct amdgpu_dpm {

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

+15 −9
Original line number Original line Diff line number Diff line
@@ -491,6 +491,8 @@ static ssize_t amdgpu_get_pp_sclk_od(struct device *dev, 




	if (adev->pp_enabled)

	if (adev->pp_enabled)

		value = amdgpu_dpm_get_sclk_od(adev);

		value = amdgpu_dpm_get_sclk_od(adev);

	else if (adev->pm.funcs->get_sclk_od)

		value = adev->pm.funcs->get_sclk_od(adev);





	return snprintf(buf, PAGE_SIZE, "%d\n", value);

	return snprintf(buf, PAGE_SIZE, "%d\n", value);

}

}
@@ -512,10 +514,14 @@ static ssize_t amdgpu_set_pp_sclk_od(struct device *dev, 
		goto fail;

		goto fail;

	}

	}





	if (adev->pp_enabled)

	if (adev->pp_enabled) {

		amdgpu_dpm_set_sclk_od(adev, (uint32_t)value);

		amdgpu_dpm_set_sclk_od(adev, (uint32_t)value);



		amdgpu_dpm_dispatch_task(adev, AMD_PP_EVENT_READJUST_POWER_STATE, NULL, NULL);

		amdgpu_dpm_dispatch_task(adev, AMD_PP_EVENT_READJUST_POWER_STATE, NULL, NULL);

	} else if (adev->pm.funcs->set_sclk_od) {

		adev->pm.funcs->set_sclk_od(adev, (uint32_t)value);

		adev->pm.dpm.current_ps = adev->pm.dpm.boot_ps;

		amdgpu_pm_compute_clocks(adev);

	}





fail:

fail:

	return count;

	return count;
@@ -1163,11 +1169,6 @@ int amdgpu_pm_sysfs_init(struct amdgpu_device *adev) 
			DRM_ERROR("failed to create device file pp_table\n");

			DRM_ERROR("failed to create device file pp_table\n");

			return ret;

			return ret;

		}

		}

		ret = device_create_file(adev->dev, &dev_attr_pp_sclk_od);

		if (ret) {

			DRM_ERROR("failed to create device file pp_sclk_od\n");

			return ret;

		}

	}

	}





	ret = device_create_file(adev->dev, &dev_attr_pp_dpm_sclk);

	ret = device_create_file(adev->dev, &dev_attr_pp_dpm_sclk);
@@ -1185,6 +1186,11 @@ int amdgpu_pm_sysfs_init(struct amdgpu_device *adev) 
		DRM_ERROR("failed to create device file pp_dpm_pcie\n");

		DRM_ERROR("failed to create device file pp_dpm_pcie\n");

		return ret;

		return ret;

	}

	}

	ret = device_create_file(adev->dev, &dev_attr_pp_sclk_od);

	if (ret) {

		DRM_ERROR("failed to create device file pp_sclk_od\n");

		return ret;

	}





	ret = amdgpu_debugfs_pm_init(adev);

	ret = amdgpu_debugfs_pm_init(adev);

	if (ret) {

	if (ret) {
@@ -1208,11 +1214,11 @@ void amdgpu_pm_sysfs_fini(struct amdgpu_device *adev) 
		device_remove_file(adev->dev, &dev_attr_pp_cur_state);

		device_remove_file(adev->dev, &dev_attr_pp_cur_state);

		device_remove_file(adev->dev, &dev_attr_pp_force_state);

		device_remove_file(adev->dev, &dev_attr_pp_force_state);

		device_remove_file(adev->dev, &dev_attr_pp_table);

		device_remove_file(adev->dev, &dev_attr_pp_table);

		device_remove_file(adev->dev, &dev_attr_pp_sclk_od);

	}

	}

	device_remove_file(adev->dev, &dev_attr_pp_dpm_sclk);

	device_remove_file(adev->dev, &dev_attr_pp_dpm_sclk);

	device_remove_file(adev->dev, &dev_attr_pp_dpm_mclk);

	device_remove_file(adev->dev, &dev_attr_pp_dpm_mclk);

	device_remove_file(adev->dev, &dev_attr_pp_dpm_pcie);

	device_remove_file(adev->dev, &dev_attr_pp_dpm_pcie);

	device_remove_file(adev->dev, &dev_attr_pp_sclk_od);

}

}





void amdgpu_pm_compute_clocks(struct amdgpu_device *adev)

void amdgpu_pm_compute_clocks(struct amdgpu_device *adev)