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.
Fixes: 64f55e629237e4752db1 ("drm/amdgpu: Add RAS EEPROM table.") Cc: Andrey Grodzovsky andrey.grodzovsky@amd.com Cc: Luben Tuikov Luben.Tuikov@amd.com Signed-off-by: Huacai Chen chenhc@lemote.com --- drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile index 42e2c1f..00962a6 100644 --- a/drivers/gpu/drm/amd/amdgpu/Makefile +++ b/drivers/gpu/drm/amd/amdgpu/Makefile @@ -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
On Thu, Oct 3, 2019 at 10:13 PM Huacai Chen chenhc@lemote.com wrote:
Already fixed: https://cgit.freedesktop.org/drm/drm/commit/?h=drm-fixes&id=ec3e5c0f0c2b...
Thanks!
Alex
dri-devel@lists.freedesktop.org
-
Alex Deucher -
Huacai Chen