Merge tag 'topic/nouveau-i915-dp-helpers-and-cleanup-2020-08-31-1' of git://anongit...

[J-linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_pmu.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
index 1311d6aec5d4b3c17e5b391659c02f1fd762d41b..69af462db34dfd31933faecb738ec647cb0075a2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
@@ -226,7 +226,7 @@ static int init_pmu_by_type(struct amdgpu_device *adev,
        pmu_entry->pmu.attr_groups = attr_groups;
        pmu_entry->pmu_perf_type = pmu_perf_type;
        snprintf(pmu_name, PMU_NAME_SIZE, "%s_%d",
-                               pmu_file_prefix, adev->ddev->primary->index);
+                               pmu_file_prefix, adev_to_drm(adev)->primary->index);
 
        ret = perf_pmu_register(&pmu_entry->pmu, pmu_name, -1);