amdgpu: make pmu support optional (d155bef0) · Commits · 戴 / test

When CONFIG_PERF_EVENTS is disabled, we cannot compile the pmu portion of the amdgpu driver: drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c:48:38: error: no member named 'hw' in 'struct perf_event' struct hw_perf_event *hwc = &event->hw; ~~~~~ ^ drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c:51:13: error: no member named 'attr' in 'struct perf_event' if (event->attr.type != event->pmu->type) ~~~~~ ^ ... Use conditional compilation for this file. Fixes: ("drm/amdgpu: add pmu counters") Signed-off-by:

Arnd Bergmann <arnd@arndb.de> Signed-off-by:

Alex Deucher <alexander.deucher@amd.com>

drivers/gpu/drm/amd/amdgpu/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,9 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \
		amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \
		amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \
		amdgpu_gmc.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \
		amdgpu_vm_sdma.o amdgpu_pmu.o amdgpu_discovery.o
		amdgpu_vm_sdma.o amdgpu_discovery.o

		amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o

		# add asic specific block
		amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -2809,6 +2809,7 @@ fence_driver_init:
		return r;
		}

		if (IS_ENABLED(CONFIG_PERF_EVENTS))
		r = amdgpu_pmu_init(adev);
		if (r)
		dev_err(adev->dev, "amdgpu_pmu_init failed\n");
		@@ -2881,6 +2882,7 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
		amdgpu_debugfs_regs_cleanup(adev);
		device_remove_file(adev->dev, &dev_attr_pcie_replay_count);
		amdgpu_ucode_sysfs_fini(adev);
		if (IS_ENABLED(CONFIG_PERF_EVENTS))
		amdgpu_pmu_fini(adev);
		amdgpu_debugfs_preempt_cleanup(adev);
		if (amdgpu_discovery)

Admin message