drm/amdgpu: Fix build error when !CONFIG_PERF_EVENTS
Subsystems (2)
PATCH 1/1 drm/amdgpu: Fix build error when !CONFIG_PERF_EVENTS
In previous release amdgpu_pmu.o is only built when CONFIG_PERF_EVENTS is selected. But after commit 64f55e629237e4752db1 ("drm/amdgpu: Add RAS EEPROM table.") it is duplicated in amdgpu-y. This change causes a build error when !CONFIG_PERF_EVENTS, so fix it.
--- drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/Makefile +1 -1
@@ -54,7 +54,7 @@ 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_ras_eeprom.o smu_v11_0_i2c.o + amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o smu_v11_0_i2c.o amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o
Signature · 6 lines
2.7.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 10 lines · Huacai Chen
In previous release amdgpu_pmu.o is only built when
CONFIG_PERF_EVENTSis selected. But after commit64f55e629237e4752db1("drm/amdgpu: Add RAS EEPROM table.") it is duplicated in amdgpu-y. This change causes a build error when !CONFIG_PERF_EVENTS, so fix it.Fixes 64f55e629237e4752db1 ("drm/amdgpu: Add RAS EEPROM table.")Cc Andrey Grodzovsky <[email protected]>Cc Luben Tuikov <[email protected]>Signed-off-by Huacai Chen <[email protected]>
Already fixed:
https://cgit.freedesktop.org/drm/drm/commit/?h=drm-fixes&id=ec3e5c0f0c2b716e768c0eee0fec30d572939ef5
Thanks!
Alex
Quoted 20 lines
--- drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/Makefile +1
-2@@ -54,7 +54,7 @@ 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_ras_eeprom.o smu_v11_0_i2c.o + amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o smu_v11_0_i2c.o amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o --2.7.0
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel