From edf8b2a0c150a5beff08de229481e065751f2912 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 14 Jan 2022 10:39:21 +0100 Subject: [PATCH] ANDROID: Kconfig.gki: fix up GKI_HIDDEN_DRM_CONFIGS entry Due to some drm Kconfig dependancy changes in the drm merge in 5.17-rc1, the select option of DRM_KMS_CMA_HELPER and DRM_GEM_CMA_HELPER need to be removed in order to be able to properly build an allmodconfig kernel. Fixes: 4b2b5e142ff4 ("drm: Move GEM memory managers into modules") Fixes: 09717af7d13d ("drm: Remove CONFIG_DRM_KMS_CMA_HELPER option") Signed-off-by: Greg Kroah-Hartman Change-Id: I0b74e37d046aaae6bfeacec1695faf4780703622 --- init/Kconfig.gki | 2 -- 1 file changed, 2 deletions(-) diff --git a/init/Kconfig.gki b/init/Kconfig.gki index bdf5db9b5afe..b77685d4d035 100644 --- a/init/Kconfig.gki +++ b/init/Kconfig.gki @@ -2,8 +2,6 @@ config GKI_HIDDEN_DRM_CONFIGS bool "Hidden DRM configs needed for GKI" select DRM_KMS_HELPER if (HAS_IOMEM && DRM) select DRM_GEM_SHMEM_HELPER if (DRM) - select DRM_GEM_CMA_HELPER - select DRM_KMS_CMA_HELPER select DRM_MIPI_DSI select DRM_TTM if (HAS_IOMEM && DRM) select VIDEOMODE_HELPERS