Commit 0b01b830 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/powerplay: enable gpu_metrics export on legacy powerplay routines 



Enable gpu_metrics support on legacy powerplay routines.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 95868b85

drivers/gpu/drm/amd/powerplay/amd_powerplay.c

+19 −0
Original line number Diff line number Diff line
@@ -1598,6 +1598,24 @@ static int pp_set_xgmi_pstate(void *handle, uint32_t pstate) 
	return 0;

}



static ssize_t pp_get_gpu_metrics(void *handle, void **table)

{

	struct pp_hwmgr *hwmgr = handle;

	ssize_t size;



	if (!hwmgr)

		return -EINVAL;



	if (!hwmgr->pm_en || !hwmgr->hwmgr_func->get_gpu_metrics)

		return -EOPNOTSUPP;



	mutex_lock(&hwmgr->smu_lock);

	size = hwmgr->hwmgr_func->get_gpu_metrics(hwmgr, table);

	mutex_unlock(&hwmgr->smu_lock);



	return size;

}



static const struct amd_pm_funcs pp_dpm_funcs = {

	.load_firmware = pp_dpm_load_fw,

	.wait_for_fw_loading_complete = pp_dpm_fw_loading_complete,
@@ -1658,4 +1676,5 @@ static const struct amd_pm_funcs pp_dpm_funcs = { 
	.smu_i2c_bus_access = pp_smu_i2c_bus_access,

	.set_df_cstate = pp_set_df_cstate,

	.set_xgmi_pstate = pp_set_xgmi_pstate,

	.get_gpu_metrics = pp_get_gpu_metrics,

};

drivers/gpu/drm/amd/powerplay/inc/hwmgr.h

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ struct pp_hwmgr_func { 
	int (*set_xgmi_pstate)(struct pp_hwmgr *hwmgr, uint32_t pstate);

	int (*disable_power_features_for_compute_performance)(struct pp_hwmgr *hwmgr,

					bool disable);

	ssize_t (*get_gpu_metrics)(struct pp_hwmgr *hwmgr, void **table);

};



struct pp_table_func {