Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbed756b authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

drm/panfrost: fix GENERIC_ATOMIC64 dependency 



[ Upstream commit 6437a549ae178a3f5a5c03e983f291ebcdc2bbc7 ]

On ARMv5 and earlier, a randconfig build can still run into

WARNING: unmet direct dependencies detected for IOMMU_IO_PGTABLE_LPAE
  Depends on [n]: IOMMU_SUPPORT [=y] && (ARM [=y] || ARM64 || COMPILE_TEST [=y]) && !GENERIC_ATOMIC64 [=y]
  Selected by [y]:
  - DRM_PANFROST [=y] && HAS_IOMEM [=y] && DRM [=y] && (ARM [=y] || ARM64 || COMPILE_TEST [=y] && !GENERIC_ATOMIC64 [=y]) && MMU [=y]

Rework the dependencies to always require a working cmpxchg64.

Fixes: db594ba3 ("drm/panfrost: depend on !GENERIC_ATOMIC64 when using COMPILE_TEST")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarSteven Price <steven.price@arm.com>
Signed-off-by: default avatarSteven Price <steven.price@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230117164456.1591901-1-arnd@kernel.org


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 914c58fe

drivers/gpu/drm/panfrost/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
config DRM_PANFROST

	tristate "Panfrost (DRM support for ARM Mali Midgard/Bifrost GPUs)"

	depends on DRM

	depends on ARM || ARM64 || (COMPILE_TEST && !GENERIC_ATOMIC64)

	depends on ARM || ARM64 || COMPILE_TEST

	depends on !GENERIC_ATOMIC64    # for IOMMU_IO_PGTABLE_LPAE

	depends on MMU

	select DRM_SCHED

	select IOMMU_SUPPORT