* [PATCH] amdgpu: Avoid building on UML
@ 2023-01-13 4:30 Peter Foley
2023-03-06 16:17 ` Felix Kuehling
0 siblings, 1 reply; 3+ messages in thread
From: Peter Foley @ 2023-01-13 4:30 UTC (permalink / raw)
To: Alex Deucher, Christian König, Pan, Xinhui, David Airlie,
Daniel Vetter
Cc: amd-gfx, dri-devel, linux-kernel, 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 <pefoley2@pefoley.com>
---
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 <pefoley2@pefoley.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] amdgpu: Avoid building on UML
2023-01-13 4:30 [PATCH] amdgpu: Avoid building on UML Peter Foley
@ 2023-03-06 16:17 ` Felix Kuehling
2023-03-07 17:31 ` Alex Deucher
0 siblings, 1 reply; 3+ messages in thread
From: Felix Kuehling @ 2023-03-06 16:17 UTC (permalink / raw)
To: Peter Foley, Alex Deucher, Christian König, Pan, Xinhui,
David Airlie, Daniel Vetter
Cc: dri-devel, amd-gfx, linux-kernel
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 <Felix.Kuehling@amd.com>
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 <pefoley2@pefoley.com>
> ---
> 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,
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] amdgpu: Avoid building on UML
2023-03-06 16:17 ` Felix Kuehling
@ 2023-03-07 17:31 ` Alex Deucher
0 siblings, 0 replies; 3+ messages in thread
From: Alex Deucher @ 2023-03-07 17:31 UTC (permalink / raw)
To: Felix Kuehling
Cc: Peter Foley, Alex Deucher, Christian König, Pan, Xinhui,
David Airlie, Daniel Vetter, amd-gfx, dri-devel, linux-kernel
Applied. Thanks.
Alex
On Mon, Mar 6, 2023 at 11:17 AM Felix Kuehling <felix.kuehling@amd.com> 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 <Felix.Kuehling@amd.com>
>
>
> 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 <pefoley2@pefoley.com>
> > ---
> > 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,
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-07 17:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-13 4:30 [PATCH] amdgpu: Avoid building on UML Peter Foley
2023-03-06 16:17 ` Felix Kuehling
2023-03-07 17:31 ` Alex Deucher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®