linux-next: build failure after merge of the amdgpu tree

From: Stephen Rothwell
Date: Thu May 27 2021 - 01:58:43 EST


Hi all,

After merging the amdgpu tree, today's linux-next build (powerpc
allyesconfig) failed like this:

ld: drivers/gpu/drm/amd/amdgpu/amdgpu_device.o:(.opd+0x408): multiple definition of `amdgpu_acpi_detect'; drivers/gpu/drm/amd/amdgpu/amdgpu_drv.o:(.opd+0x1c8): first defined here
ld: drivers/gpu/drm/amd/amdgpu/amdgpu_device.o: in function `.amdgpu_acpi_detect':
amdgpu_device.c:(.text.amdgpu_acpi_detect+0x0): multiple definition of `.amdgpu_acpi_detect'; drivers/gpu/drm/amd/amdgpu/amdgpu_drv.o:amdgpu_drv.c:(.text.amdgpu_acpi_detect+0x0): first defined here

and many, many more.

Caused by commit

753c7d6d85f5 ("drm/amdgpu/acpi: make ATPX/ATCS structures global")

The !defined(CONFIG_ACPI) version of amdgpu_acpi_detect() is missing
"static inline" ...

I have reverted that commit for today.

--
Cheers,
Stephen Rothwell

Attachment: pgprcfyKdzUmD.pgp
Description: OpenPGP digital signature