2023-01-13 04:45:20

by Peter Foley

[permalink] [raw]
Subject: [PATCH] amdgpu: Avoid building on UML

The amdgpu driver tries to use fields not supported by UML's cpuinfo
struct. Disable the driver when targeting UML to avoid tripping up
allyesconfig.

e.g.
../drivers/gpu/drm/amd/amdgpu/../pm/powerplay/hwmgr/smu7_hwmgr.c: In function ‘intel_core_rkl_chk’:
../drivers/gpu/drm/amd/amdgpu/../pm/powerplay/hwmgr/smu7_hwmgr.c:1742:33: error: initialization of ‘struct cpuinfo_x86 *’ from incompatible pointer type ‘struct cpuinfo_um *’ [-Werror=incompatible-pointer-types
]
../drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function ‘kfd_cpumask_to_apic_id’:
../drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:2157:48: error: ‘struct cpuinfo_um’ has no member named ‘apicid’

Signed-off-by: Peter Foley <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/Kconfig | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig b/drivers/gpu/drm/amd/amdgpu/Kconfig
index 5fcd510f1abb..aa0008ff8712 100644
--- a/drivers/gpu/drm/amd/amdgpu/Kconfig
+++ b/drivers/gpu/drm/amd/amdgpu/Kconfig
@@ -3,6 +3,7 @@
config DRM_AMDGPU
tristate "AMD GPU"
depends on DRM && PCI && MMU
+ depends on !UML
select FW_LOADER
select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_HDMI_HELPER

---
base-commit: 1b929c02afd37871d5afb9d498426f83432e71c2
change-id: 20230112-amduml-565935d34bfb

Best regards,
--
Peter Foley <[email protected]>


2023-03-06 16:25:40

by Felix Kuehling

[permalink] [raw]
Subject: Re: [PATCH] amdgpu: Avoid building on UML

Looks like this patch got lost over the holidays. Alex, are you OK with
applying this patch? Or are people looking for a more general solution
to not build HW drivers for UML? FWIW:

Acked-by: Felix Kuehling <[email protected]>


Am 2023-01-12 um 23:30 schrieb Peter Foley:
> The amdgpu driver tries to use fields not supported by UML's cpuinfo
> struct. Disable the driver when targeting UML to avoid tripping up
> allyesconfig.
>
> e.g.
> ../drivers/gpu/drm/amd/amdgpu/../pm/powerplay/hwmgr/smu7_hwmgr.c: In function ‘intel_core_rkl_chk’:
> ../drivers/gpu/drm/amd/amdgpu/../pm/powerplay/hwmgr/smu7_hwmgr.c:1742:33: error: initialization of ‘struct cpuinfo_x86 *’ from incompatible pointer type ‘struct cpuinfo_um *’ [-Werror=incompatible-pointer-types
> ]
> ../drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function ‘kfd_cpumask_to_apic_id’:
> ../drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:2157:48: error: ‘struct cpuinfo_um’ has no member named ‘apicid’
>
> Signed-off-by: Peter Foley <[email protected]>
> ---
> drivers/gpu/drm/amd/amdgpu/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig b/drivers/gpu/drm/amd/amdgpu/Kconfig
> index 5fcd510f1abb..aa0008ff8712 100644
> --- a/drivers/gpu/drm/amd/amdgpu/Kconfig
> +++ b/drivers/gpu/drm/amd/amdgpu/Kconfig
> @@ -3,6 +3,7 @@
> config DRM_AMDGPU
> tristate "AMD GPU"
> depends on DRM && PCI && MMU
> + depends on !UML
> select FW_LOADER
> select DRM_DISPLAY_DP_HELPER
> select DRM_DISPLAY_HDMI_HELPER
>
> ---
> base-commit: 1b929c02afd37871d5afb9d498426f83432e71c2
> change-id: 20230112-amduml-565935d34bfb
>
> Best regards,

2023-03-07 17:36:38

by Alex Deucher

[permalink] [raw]
Subject: Re: [PATCH] amdgpu: Avoid building on UML

Applied. Thanks.

Alex

On Mon, Mar 6, 2023 at 11:17 AM Felix Kuehling <[email protected]> wrote:
>
> Looks like this patch got lost over the holidays. Alex, are you OK with
> applying this patch? Or are people looking for a more general solution
> to not build HW drivers for UML? FWIW:
>
> Acked-by: Felix Kuehling <[email protected]>
>
>
> Am 2023-01-12 um 23:30 schrieb Peter Foley:
> > The amdgpu driver tries to use fields not supported by UML's cpuinfo
> > struct. Disable the driver when targeting UML to avoid tripping up
> > allyesconfig.
> >
> > e.g.
> > ../drivers/gpu/drm/amd/amdgpu/../pm/powerplay/hwmgr/smu7_hwmgr.c: In function ‘intel_core_rkl_chk’:
> > ../drivers/gpu/drm/amd/amdgpu/../pm/powerplay/hwmgr/smu7_hwmgr.c:1742:33: error: initialization of ‘struct cpuinfo_x86 *’ from incompatible pointer type ‘struct cpuinfo_um *’ [-Werror=incompatible-pointer-types
> > ]
> > ../drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function ‘kfd_cpumask_to_apic_id’:
> > ../drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:2157:48: error: ‘struct cpuinfo_um’ has no member named ‘apicid’
> >
> > Signed-off-by: Peter Foley <[email protected]>
> > ---
> > drivers/gpu/drm/amd/amdgpu/Kconfig | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig b/drivers/gpu/drm/amd/amdgpu/Kconfig
> > index 5fcd510f1abb..aa0008ff8712 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/Kconfig
> > +++ b/drivers/gpu/drm/amd/amdgpu/Kconfig
> > @@ -3,6 +3,7 @@
> > config DRM_AMDGPU
> > tristate "AMD GPU"
> > depends on DRM && PCI && MMU
> > + depends on !UML
> > select FW_LOADER
> > select DRM_DISPLAY_DP_HELPER
> > select DRM_DISPLAY_HDMI_HELPER
> >
> > ---
> > base-commit: 1b929c02afd37871d5afb9d498426f83432e71c2
> > change-id: 20230112-amduml-565935d34bfb
> >
> > Best regards,