Commit c9ffa427 authored by Yintian Tao's avatar Yintian Tao Committed by Alex Deucher
Browse files

drm/amd/powerplay: enable pp one vf mode for vega10 



Originally, due to the restriction from PSP and SMU, VF has
to send message to hypervisor driver to handle powerplay
change which is complicated and redundant. Currently, SMU
and PSP can support VF to directly handle powerplay
change by itself. Therefore, the old code about the handshake
between VF and PF to handle powerplay will be removed and VF
will use new the registers below to handshake with SMU.
mmMP1_SMN_C2PMSG_101: register to handle SMU message
mmMP1_SMN_C2PMSG_102: register to handle SMU parameter
mmMP1_SMN_C2PMSG_103: register to handle SMU response

v2: remove module parameter pp_one_vf
v3: fix the parens
v4: forbid vf to change smu feature
v5: use hwmon_attributes_visible to skip sepicified hwmon atrribute
v6: change skip condition at vega10_copy_table_to_smc

Signed-off-by: default avatarYintian Tao <yttao@amd.com>
Acked-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4cf781c2

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

+5 −11
Original line number Diff line number Diff line
@@ -1877,6 +1877,9 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 
		}

	}



	if (amdgpu_sriov_vf(adev))

		amdgpu_virt_init_data_exchange(adev);



	r = amdgpu_ib_pool_init(adev);

	if (r) {

		dev_err(adev->dev, "IB initialization failed (%d).\n", r);
@@ -1918,11 +1921,8 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 
	amdgpu_amdkfd_device_init(adev);



init_failed:

	if (amdgpu_sriov_vf(adev)) {

		if (!r)

			amdgpu_virt_init_data_exchange(adev);

	if (amdgpu_sriov_vf(adev))

		amdgpu_virt_release_full_gpu(adev, true);

	}



	return r;

}
@@ -2822,7 +2822,6 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	mutex_init(&adev->virt.vf_errors.lock);

	hash_init(adev->mn_hash);

	mutex_init(&adev->lock_reset);

	mutex_init(&adev->virt.dpm_mutex);

	mutex_init(&adev->psp.mutex);



	r = amdgpu_device_check_arguments(adev);
@@ -3041,9 +3040,6 @@ int amdgpu_device_init(struct amdgpu_device *adev, 


	amdgpu_fbdev_init(adev);



	if (amdgpu_sriov_vf(adev) && amdgim_is_hwperf(adev))

		amdgpu_pm_virt_sysfs_init(adev);



	r = amdgpu_pm_sysfs_init(adev);

	if (r) {

		adev->pm_sysfs_en = false;
@@ -3188,8 +3184,6 @@ void amdgpu_device_fini(struct amdgpu_device *adev) 
	iounmap(adev->rmmio);

	adev->rmmio = NULL;

	amdgpu_device_doorbell_fini(adev);

	if (amdgpu_sriov_vf(adev) && amdgim_is_hwperf(adev))

		amdgpu_pm_virt_sysfs_fini(adev);



	amdgpu_debugfs_regs_cleanup(adev);

	device_remove_file(adev->dev, &dev_attr_pcie_replay_count);
@@ -3670,6 +3664,7 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, 
	if (r)

		goto error;



	amdgpu_virt_init_data_exchange(adev);

	/* we need recover gart prior to run SMC/CP/SDMA resume */

	amdgpu_gtt_mgr_recover(&adev->mman.bdev.man[TTM_PL_TT]);
@@ -3687,7 +3682,6 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, 
	amdgpu_amdkfd_post_reset(adev);



error:

	amdgpu_virt_init_data_exchange(adev);

	amdgpu_virt_release_full_gpu(adev, true);

	if (!r && adev->virt.gim_feature & AMDGIM_FEATURE_GIM_FLR_VRAMLOST) {

		amdgpu_inc_vram_lost(adev);

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

+0 −4
Original line number Diff line number Diff line
@@ -703,10 +703,6 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
		if (adev->pm.dpm_enabled) {

			dev_info.max_engine_clock = amdgpu_dpm_get_sclk(adev, false) * 10;

			dev_info.max_memory_clock = amdgpu_dpm_get_mclk(adev, false) * 10;

		} else if (amdgpu_sriov_vf(adev) && amdgim_is_hwperf(adev) &&

			   adev->virt.ops->get_pp_clk) {

			dev_info.max_engine_clock = amdgpu_virt_get_sclk(adev, false) * 10;

			dev_info.max_memory_clock = amdgpu_virt_get_mclk(adev, false) * 10;

		} else {

			dev_info.max_engine_clock = adev->clock.default_sclk * 10;

			dev_info.max_memory_clock = adev->clock.default_mclk * 10;

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

+120 −62
Original line number Diff line number Diff line
@@ -159,6 +159,9 @@ static ssize_t amdgpu_get_dpm_state(struct device *dev, 
	struct amdgpu_device *adev = ddev->dev_private;

	enum amd_pm_state_type pm;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	if (is_support_sw_smu(adev)) {

		if (adev->smu.ppt_funcs->get_current_power_state)

			pm = smu_get_current_power_state(&adev->smu);
@@ -184,6 +187,9 @@ static ssize_t amdgpu_set_dpm_state(struct device *dev, 
	struct amdgpu_device *adev = ddev->dev_private;

	enum amd_pm_state_type  state;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return -EINVAL;



	if (strncmp("battery", buf, strlen("battery")) == 0)

		state = POWER_STATE_TYPE_BATTERY;

	else if (strncmp("balanced", buf, strlen("balanced")) == 0)
@@ -283,7 +289,7 @@ static ssize_t amdgpu_get_dpm_forced_performance_level(struct device *dev, 
	struct amdgpu_device *adev = ddev->dev_private;

	enum amd_dpm_forced_level level = 0xff;



	if (amdgpu_sriov_vf(adev))

	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	if ((adev->flags & AMD_IS_PX) &&
@@ -320,6 +326,9 @@ static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev, 
	enum amd_dpm_forced_level current_level = 0xff;

	int ret = 0;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return -EINVAL;



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

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

	     (ddev->switch_power_state != DRM_SWITCH_POWER_ON))
@@ -348,19 +357,6 @@ static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev, 
		goto fail;

	}



	/* handle sriov case here */

	if (amdgpu_sriov_vf(adev)) {

		if (amdgim_is_hwperf(adev) &&

		    adev->virt.ops->force_dpm_level) {

			mutex_lock(&adev->pm.mutex);

			adev->virt.ops->force_dpm_level(adev, level);

			mutex_unlock(&adev->pm.mutex);

			return count;

		} else {

			return -EINVAL;

		}

	}



	if (is_support_sw_smu(adev))

		current_level = smu_get_performance_level(&adev->smu);

	else if (adev->powerplay.pp_funcs->get_performance_level)
@@ -440,6 +436,9 @@ static ssize_t amdgpu_get_pp_cur_state(struct device *dev, 
	enum amd_pm_state_type pm = 0;

	int i = 0, ret = 0;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	if (is_support_sw_smu(adev)) {

		pm = smu_get_current_power_state(smu);

		ret = smu_get_power_num_states(smu, &data);
@@ -469,6 +468,9 @@ static ssize_t amdgpu_get_pp_force_state(struct device *dev, 
	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = ddev->dev_private;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	if (adev->pp_force_state_enabled)

		return amdgpu_get_pp_cur_state(dev, attr, buf);

	else
@@ -486,6 +488,9 @@ static ssize_t amdgpu_set_pp_force_state(struct device *dev, 
	unsigned long idx;

	int ret;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return -EINVAL;



	if (strlen(buf) == 1)

		adev->pp_force_state_enabled = false;

	else if (is_support_sw_smu(adev))
@@ -535,6 +540,9 @@ static ssize_t amdgpu_get_pp_table(struct device *dev, 
	char *table = NULL;

	int size;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	if (is_support_sw_smu(adev)) {

		size = smu_sys_get_pp_table(&adev->smu, (void **)&table);

		if (size < 0)
@@ -562,6 +570,9 @@ static ssize_t amdgpu_set_pp_table(struct device *dev, 
	struct amdgpu_device *adev = ddev->dev_private;

	int ret = 0;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return -EINVAL;



	if (is_support_sw_smu(adev)) {

		ret = smu_sys_set_pp_table(&adev->smu, (void *)buf, count);

		if (ret)
@@ -654,6 +665,9 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, 
	const char delimiter[3] = {' ', '\n', '\0'};

	uint32_t type;



	if (amdgpu_sriov_vf(adev))

		return -EINVAL;



	if (count > 127)

		return -EINVAL;
@@ -726,6 +740,9 @@ static ssize_t amdgpu_get_pp_od_clk_voltage(struct device *dev, 
	struct amdgpu_device *adev = ddev->dev_private;

	uint32_t size = 0;



	if (amdgpu_sriov_vf(adev))

		return 0;



	if (is_support_sw_smu(adev)) {

		size = smu_print_clk_levels(&adev->smu, SMU_OD_SCLK, buf);

		size += smu_print_clk_levels(&adev->smu, SMU_OD_MCLK, buf+size);
@@ -770,6 +787,9 @@ static ssize_t amdgpu_set_pp_feature_status(struct device *dev, 
	uint64_t featuremask;

	int ret;



	if (amdgpu_sriov_vf(adev))

		return -EINVAL;



	ret = kstrtou64(buf, 0, &featuremask);

	if (ret)

		return -EINVAL;
@@ -796,6 +816,9 @@ static ssize_t amdgpu_get_pp_feature_status(struct device *dev, 
	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = ddev->dev_private;



	if (amdgpu_sriov_vf(adev))

		return 0;



	if (is_support_sw_smu(adev)) {

		return smu_sys_get_pp_feature_mask(&adev->smu, buf);

	} else if (adev->powerplay.pp_funcs->get_ppfeature_status)
@@ -841,9 +864,8 @@ static ssize_t amdgpu_get_pp_dpm_sclk(struct device *dev, 
	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = ddev->dev_private;



	if (amdgpu_sriov_vf(adev) && amdgim_is_hwperf(adev) &&

	    adev->virt.ops->get_pp_clk)

		return adev->virt.ops->get_pp_clk(adev, PP_SCLK, buf);

	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	if (is_support_sw_smu(adev))

		return smu_print_clk_levels(&adev->smu, SMU_SCLK, buf);
@@ -899,8 +921,8 @@ static ssize_t amdgpu_set_pp_dpm_sclk(struct device *dev, 
	int ret;

	uint32_t mask = 0;



	if (amdgpu_sriov_vf(adev))

		return 0;

	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return -EINVAL;



	ret = amdgpu_read_mask(buf, count, &mask);

	if (ret)
@@ -924,9 +946,8 @@ static ssize_t amdgpu_get_pp_dpm_mclk(struct device *dev, 
	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = ddev->dev_private;



	if (amdgpu_sriov_vf(adev) && amdgim_is_hwperf(adev) &&

	    adev->virt.ops->get_pp_clk)

		return adev->virt.ops->get_pp_clk(adev, PP_MCLK, buf);

	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	if (is_support_sw_smu(adev))

		return smu_print_clk_levels(&adev->smu, SMU_MCLK, buf);
@@ -946,8 +967,8 @@ static ssize_t amdgpu_set_pp_dpm_mclk(struct device *dev, 
	int ret;

	uint32_t mask = 0;



	if (amdgpu_sriov_vf(adev))

		return 0;

	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

			return -EINVAL;



	ret = amdgpu_read_mask(buf, count, &mask);

	if (ret)
@@ -971,6 +992,9 @@ static ssize_t amdgpu_get_pp_dpm_socclk(struct device *dev, 
	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = ddev->dev_private;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	if (is_support_sw_smu(adev))

		return smu_print_clk_levels(&adev->smu, SMU_SOCCLK, buf);

	else if (adev->powerplay.pp_funcs->print_clock_levels)
@@ -989,6 +1013,9 @@ static ssize_t amdgpu_set_pp_dpm_socclk(struct device *dev, 
	int ret;

	uint32_t mask = 0;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return -EINVAL;



	ret = amdgpu_read_mask(buf, count, &mask);

	if (ret)

		return ret;
@@ -1011,6 +1038,9 @@ static ssize_t amdgpu_get_pp_dpm_fclk(struct device *dev, 
	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = ddev->dev_private;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	if (is_support_sw_smu(adev))

		return smu_print_clk_levels(&adev->smu, SMU_FCLK, buf);

	else if (adev->powerplay.pp_funcs->print_clock_levels)
@@ -1029,6 +1059,9 @@ static ssize_t amdgpu_set_pp_dpm_fclk(struct device *dev, 
	int ret;

	uint32_t mask = 0;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return -EINVAL;



	ret = amdgpu_read_mask(buf, count, &mask);

	if (ret)

		return ret;
@@ -1051,6 +1084,9 @@ static ssize_t amdgpu_get_pp_dpm_dcefclk(struct device *dev, 
	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = ddev->dev_private;



	if (amdgpu_sriov_vf(adev))

		return 0;



	if (is_support_sw_smu(adev))

		return smu_print_clk_levels(&adev->smu, SMU_DCEFCLK, buf);

	else if (adev->powerplay.pp_funcs->print_clock_levels)
@@ -1069,6 +1105,9 @@ static ssize_t amdgpu_set_pp_dpm_dcefclk(struct device *dev, 
	int ret;

	uint32_t mask = 0;



	if (amdgpu_sriov_vf(adev))

		return -EINVAL;



	ret = amdgpu_read_mask(buf, count, &mask);

	if (ret)

		return ret;
@@ -1091,6 +1130,9 @@ static ssize_t amdgpu_get_pp_dpm_pcie(struct device *dev, 
	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = ddev->dev_private;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	if (is_support_sw_smu(adev))

		return smu_print_clk_levels(&adev->smu, SMU_PCIE, buf);

	else if (adev->powerplay.pp_funcs->print_clock_levels)
@@ -1109,6 +1151,9 @@ static ssize_t amdgpu_set_pp_dpm_pcie(struct device *dev, 
	int ret;

	uint32_t mask = 0;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return -EINVAL;



	ret = amdgpu_read_mask(buf, count, &mask);

	if (ret)

		return ret;
@@ -1132,6 +1177,9 @@ static ssize_t amdgpu_get_pp_sclk_od(struct device *dev, 
	struct amdgpu_device *adev = ddev->dev_private;

	uint32_t value = 0;



	if (amdgpu_sriov_vf(adev))

		return 0;



	if (is_support_sw_smu(adev))

		value = smu_get_od_percentage(&(adev->smu), SMU_OD_SCLK);

	else if (adev->powerplay.pp_funcs->get_sclk_od)
@@ -1150,6 +1198,9 @@ static ssize_t amdgpu_set_pp_sclk_od(struct device *dev, 
	int ret;

	long int value;



	if (amdgpu_sriov_vf(adev))

		return -EINVAL;



	ret = kstrtol(buf, 0, &value);



	if (ret) {
@@ -1183,6 +1234,9 @@ static ssize_t amdgpu_get_pp_mclk_od(struct device *dev, 
	struct amdgpu_device *adev = ddev->dev_private;

	uint32_t value = 0;



	if (amdgpu_sriov_vf(adev))

		return 0;



	if (is_support_sw_smu(adev))

		value = smu_get_od_percentage(&(adev->smu), SMU_OD_MCLK);

	else if (adev->powerplay.pp_funcs->get_mclk_od)
@@ -1201,6 +1255,9 @@ static ssize_t amdgpu_set_pp_mclk_od(struct device *dev, 
	int ret;

	long int value;



	if (amdgpu_sriov_vf(adev))

		return 0;



	ret = kstrtol(buf, 0, &value);



	if (ret) {
@@ -1253,6 +1310,9 @@ static ssize_t amdgpu_get_pp_power_profile_mode(struct device *dev, 
	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = ddev->dev_private;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	if (is_support_sw_smu(adev))

		return smu_get_power_profile_mode(&adev->smu, buf);

	else if (adev->powerplay.pp_funcs->get_power_profile_mode)
@@ -1285,6 +1345,9 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev, 
	if (ret)

		goto fail;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return -EINVAL;



	if (profile_mode == PP_SMC_POWER_PROFILE_CUSTOM) {

		if (count < 2 || count > 127)

			return -EINVAL;
@@ -1331,6 +1394,9 @@ static ssize_t amdgpu_get_busy_percent(struct device *dev, 
	struct amdgpu_device *adev = ddev->dev_private;

	int r, value, size = sizeof(value);



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	/* read the IP busy sensor */

	r = amdgpu_dpm_read_sensor(adev, AMDGPU_PP_SENSOR_GPU_LOAD,

				   (void *)&value, &size);
@@ -1357,6 +1423,9 @@ static ssize_t amdgpu_get_memory_busy_percent(struct device *dev, 
	struct amdgpu_device *adev = ddev->dev_private;

	int r, value, size = sizeof(value);



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	/* read the IP busy sensor */

	r = amdgpu_dpm_read_sensor(adev, AMDGPU_PP_SENSOR_MEM_LOAD,

				   (void *)&value, &size);
@@ -1387,6 +1456,9 @@ static ssize_t amdgpu_get_pcie_bw(struct device *dev, 
	struct amdgpu_device *adev = ddev->dev_private;

	uint64_t count0, count1;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	amdgpu_asic_get_pcie_usage(adev, &count0, &count1);

	return snprintf(buf, PAGE_SIZE,	"%llu %llu %i\n",

			count0, count1, pcie_get_mps(adev->pdev));
@@ -1409,6 +1481,9 @@ static ssize_t amdgpu_get_unique_id(struct device *dev, 
	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = ddev->dev_private;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	if (adev->unique_id)

		return snprintf(buf, PAGE_SIZE, "%016llx\n", adev->unique_id);
@@ -1603,6 +1678,7 @@ static ssize_t amdgpu_hwmon_get_pwm1_enable(struct device *dev, 
{

	struct amdgpu_device *adev = dev_get_drvdata(dev);

	u32 pwm_mode = 0;



	if (is_support_sw_smu(adev)) {

		pwm_mode = smu_get_fan_control_mode(&adev->smu);

	} else {
@@ -2053,6 +2129,9 @@ static ssize_t amdgpu_hwmon_set_power_cap(struct device *dev, 
	int err;

	u32 value;



	if (amdgpu_sriov_vf(adev))

		return -EINVAL;



	err = kstrtou32(buf, 10, &value);

	if (err)

		return err;
@@ -2299,6 +2378,23 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 
	struct amdgpu_device *adev = dev_get_drvdata(dev);

	umode_t effective_mode = attr->mode;



	/* under multi-vf mode, the hwmon attributes are all not supported */

	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	/* there is no fan under pp one vf mode */

	if (amdgpu_sriov_is_pp_one_vf(adev) &&

	    (attr == &sensor_dev_attr_pwm1.dev_attr.attr ||

	     attr == &sensor_dev_attr_pwm1_enable.dev_attr.attr ||

	     attr == &sensor_dev_attr_pwm1_max.dev_attr.attr ||

	     attr == &sensor_dev_attr_pwm1_min.dev_attr.attr ||

	     attr == &sensor_dev_attr_fan1_input.dev_attr.attr ||

	     attr == &sensor_dev_attr_fan1_min.dev_attr.attr ||

	     attr == &sensor_dev_attr_fan1_max.dev_attr.attr ||

	     attr == &sensor_dev_attr_fan1_target.dev_attr.attr ||

	     attr == &sensor_dev_attr_fan1_enable.dev_attr.attr))

		return 0;



	/* Skip fan attributes if fan is not present */

	if (adev->pm.no_fan && (attr == &sensor_dev_attr_pwm1.dev_attr.attr ||

	    attr == &sensor_dev_attr_pwm1_enable.dev_attr.attr ||
@@ -2730,44 +2826,6 @@ void amdgpu_dpm_enable_jpeg(struct amdgpu_device *adev, bool enable) 
	}

}



int amdgpu_pm_virt_sysfs_init(struct amdgpu_device *adev)

{

	int ret = 0;



	if (!(amdgpu_sriov_vf(adev) && amdgim_is_hwperf(adev)))

		return ret;



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

	if (ret) {

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

		return ret;

	}



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

	if (ret) {

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

		return ret;

	}



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

	if (ret) {

		DRM_ERROR("failed to create device file for dpm state\n");

		return ret;

	}



	return ret;

}



void amdgpu_pm_virt_sysfs_fini(struct amdgpu_device *adev)

{

	if (!(amdgpu_sriov_vf(adev) && amdgim_is_hwperf(adev)))

		return;



	device_remove_file(adev->dev, &dev_attr_power_dpm_force_performance_level);

	device_remove_file(adev->dev, &dev_attr_pp_dpm_sclk);

	device_remove_file(adev->dev, &dev_attr_pp_dpm_mclk);

}



int amdgpu_pm_load_smu_firmware(struct amdgpu_device *adev, uint32_t *smu_version)

{

	int r;

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

+0 −51
Original line number Diff line number Diff line
@@ -379,54 +379,3 @@ void amdgpu_virt_init_data_exchange(struct amdgpu_device *adev) 
		}

	}

}
 


static uint32_t parse_clk(char *buf, bool min)

{

        char *ptr = buf;

        uint32_t clk = 0;



        do {

                ptr = strchr(ptr, ':');

                if (!ptr)

                        break;

                ptr+=2;

		if (kstrtou32(ptr, 10, &clk))

			return 0;

        } while (!min);



        return clk * 100;

}



uint32_t amdgpu_virt_get_sclk(struct amdgpu_device *adev, bool lowest)

{

	char *buf = NULL;

	uint32_t clk = 0;



	buf = kzalloc(PAGE_SIZE, GFP_KERNEL);

	if (!buf)

		return -ENOMEM;



	adev->virt.ops->get_pp_clk(adev, PP_SCLK, buf);

	clk = parse_clk(buf, lowest);



	kfree(buf);



	return clk;

}



uint32_t amdgpu_virt_get_mclk(struct amdgpu_device *adev, bool lowest)

{

	char *buf = NULL;

	uint32_t clk = 0;



	buf = kzalloc(PAGE_SIZE, GFP_KERNEL);

	if (!buf)

		return -ENOMEM;



	adev->virt.ops->get_pp_clk(adev, PP_MCLK, buf);

	clk = parse_clk(buf, lowest);



	kfree(buf);



	return clk;

}

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

+4 −10
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ struct amdgpu_virt_ops { 
	int (*reset_gpu)(struct amdgpu_device *adev);

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

	void (*trans_msg)(struct amdgpu_device *adev, u32 req, u32 data1, u32 data2, u32 data3);

	int (*get_pp_clk)(struct amdgpu_device *adev, u32 type, char *buf);

	int (*force_dpm_level)(struct amdgpu_device *adev, u32 level);

};



/*
@@ -85,8 +83,8 @@ enum AMDGIM_FEATURE_FLAG { 
	AMDGIM_FEATURE_GIM_LOAD_UCODES   = 0x2,

	/* VRAM LOST by GIM */

	AMDGIM_FEATURE_GIM_FLR_VRAMLOST = 0x4,

	/* HW PERF SIM in GIM */

	AMDGIM_FEATURE_HW_PERF_SIMULATION = (1 << 3),

	/* PP ONE VF MODE in GIM */

	AMDGIM_FEATURE_PP_ONE_VF = (1 << 4),

};



struct amd_sriov_msg_pf2vf_info_header {
@@ -257,8 +255,6 @@ struct amdgpu_virt { 
	struct amdgpu_vf_error_buffer   vf_errors;

	struct amdgpu_virt_fw_reserve	fw_reserve;

	uint32_t gim_feature;

	/* protect DPM events to GIM */

	struct mutex                    dpm_mutex;

	uint32_t reg_access_mode;

};
@@ -286,8 +282,8 @@ static inline bool is_virtual_machine(void) 
#endif

}



#define amdgim_is_hwperf(adev) \

	((adev)->virt.gim_feature & AMDGIM_FEATURE_HW_PERF_SIMULATION)

#define amdgpu_sriov_is_pp_one_vf(adev) \

	((adev)->virt.gim_feature & AMDGIM_FEATURE_PP_ONE_VF)



bool amdgpu_virt_mmio_blocked(struct amdgpu_device *adev);

void amdgpu_virt_init_setting(struct amdgpu_device *adev);
@@ -306,6 +302,4 @@ int amdgpu_virt_fw_reserve_get_checksum(void *obj, unsigned long obj_size, 
					unsigned int key,

					unsigned int chksum);

void amdgpu_virt_init_data_exchange(struct amdgpu_device *adev);

uint32_t amdgpu_virt_get_sclk(struct amdgpu_device *adev, bool lowest);

uint32_t amdgpu_virt_get_mclk(struct amdgpu_device *adev, bool lowest);

#endif