Commit 3b94fb10 authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher
Browse files

drm/amd/powerplay: add limit of pp_feature for smu (v3) 



Move pp_feature from the struct of amd_powerplay to amdgpu_device.
Add pp_feature limit for overdrive interface.

v2: put pp_feature into struct amdgpu_pm.
v3: merge feature_mask with pp_feature.

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarKevin Wang <kevin1.wang@amd.com>
Suggested-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Suggested-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a8394cfa

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

+0 −1
Original line number Diff line number Diff line
@@ -703,7 +703,6 @@ enum amd_hw_ip_block_type { 
struct amd_powerplay {

	void *pp_handle;

	const struct amd_pm_funcs *pp_funcs;

	uint32_t pp_feature;

};



#define AMDGPU_RESET_MAGIC_NUM 64

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

+1 −1
Original line number Diff line number Diff line
@@ -1506,7 +1506,7 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) 
			return -EAGAIN;

	}



	adev->powerplay.pp_feature = amdgpu_pp_feature_mask;

	adev->pm.pp_feature = amdgpu_pp_feature_mask;



	for (i = 0; i < adev->num_ip_blocks; i++) {

		if ((amdgpu_ip_block_mask & (1 << i)) == 0) {

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

+3 −0
Original line number Diff line number Diff line
@@ -445,6 +445,9 @@ struct amdgpu_pm { 
	uint32_t                smu_prv_buffer_size;

	struct amdgpu_bo        *smu_prv_buffer;

	bool ac_power;

	/* powerplay feature */

	uint32_t pp_feature;



};



#define R600_SSTU_DFLT                               0

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

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ void amdgpu_gfx_compute_mqd_sw_fini(struct amdgpu_device *adev) 


void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable)

{

	if (!(adev->powerplay.pp_feature & PP_GFXOFF_MASK))

	if (!(adev->pm.pp_feature & PP_GFXOFF_MASK))

		return;



	if (!adev->powerplay.pp_funcs || !adev->powerplay.pp_funcs->set_powergating_by_smu)

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

+4 −2
Original line number Diff line number Diff line
@@ -2569,7 +2569,8 @@ int amdgpu_pm_sysfs_init(struct amdgpu_device *adev) 
				"pp_power_profile_mode\n");

		return ret;

	}

	if (is_support_sw_smu(adev) || hwmgr->od_enabled) {

	if ((is_support_sw_smu(adev) && adev->smu.od_enabled) ||

	    (!is_support_sw_smu(adev) && hwmgr->od_enabled)) {

		ret = device_create_file(adev->dev,

				&dev_attr_pp_od_clk_voltage);

		if (ret) {
@@ -2645,7 +2646,8 @@ void amdgpu_pm_sysfs_fini(struct amdgpu_device *adev) 
	device_remove_file(adev->dev, &dev_attr_pp_mclk_od);

	device_remove_file(adev->dev,

			&dev_attr_pp_power_profile_mode);

	if (hwmgr->od_enabled)

	if ((is_support_sw_smu(adev) && adev->smu.od_enabled) ||

	    (!is_support_sw_smu(adev) && hwmgr->od_enabled))

		device_remove_file(adev->dev,

				&dev_attr_pp_od_clk_voltage);

	device_remove_file(adev->dev, &dev_attr_gpu_busy_percent);

CRA Git | Maintained and supported by SUSTech CRA and CCSE