diff options
author | Jonathan Kim <jonathan.kim@amd.com> | 2020-06-18 10:40:14 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2020-10-07 14:44:16 -0400 |
commit | 576e0ec26b68ff4cd58d1222a5988a4d29711e2a (patch) | |
tree | a5ab146e40e316a89feb2eeaafcd7dd3df1867d4 /drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | |
parent | 4b74ed75ae1303022c7a1da07e941302da31db46 (diff) | |
download | linux-576e0ec26b68ff4cd58d1222a5988a4d29711e2a.tar.gz linux-576e0ec26b68ff4cd58d1222a5988a4d29711e2a.tar.bz2 linux-576e0ec26b68ff4cd58d1222a5988a4d29711e2a.zip |
drm/amdgpu: fix xgmi perfmon a-b-a problem
Mapping hw counters per event config will cause ABA problems so map per
event instead.
v2: Discontinue starting perf counters if add fails. Make it clear what's
happening with pmc_start.
Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
Reviewed-by: Harish Kasiviswanathan <harish.kasiviswanathan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_df.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_df.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_df.h index 373cdebe0e2f..52488bb45112 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_df.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_df.h @@ -44,11 +44,11 @@ struct amdgpu_df_funcs { void (*enable_ecc_force_par_wr_rmw)(struct amdgpu_device *adev, bool enable); int (*pmc_start)(struct amdgpu_device *adev, uint64_t config, - int is_add); + int counter_idx, int is_add); int (*pmc_stop)(struct amdgpu_device *adev, uint64_t config, - int is_remove); + int counter_idx, int is_remove); void (*pmc_get_count)(struct amdgpu_device *adev, uint64_t config, - uint64_t *count); + int counter_idx, uint64_t *count); uint64_t (*get_fica)(struct amdgpu_device *adev, uint32_t ficaa_val); void (*set_fica)(struct amdgpu_device *adev, uint32_t ficaa_val, uint32_t ficadl_val, uint32_t ficadh_val); |