From patchwork Fri Nov 15 16:23:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13876550 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 76DC7D68BC6 for ; Fri, 15 Nov 2024 16:23:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E36DA10E89E; Fri, 15 Nov 2024 16:23:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="cQUYRmpn"; dkim-atps=neutral Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8DA3310E89E for ; Fri, 15 Nov 2024 16:23:29 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id C7E405C5B35; Fri, 15 Nov 2024 16:22:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8F10C4CECF; Fri, 15 Nov 2024 16:23:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731687808; bh=17c2BctoatZCGP+sdz3tAGm/ndqqwG8Ri12IIiba7I0=; h=From:To:Cc:Subject:Date:From; b=cQUYRmpnxftDsI7zRrVikCiERAoyp0k7BNogOtUbU37ZJX/C7M2+lkVArUzi/A6xx MGrGhHkv2+dlRBl7Jha6+VUsZaQMa17fz34YKTY4VNPLKIzzC1w75ItHJt5crbvqHn Fi97xBOw93OzGcR4bkwW/FoQrxMkpIpehXx9jc9u/bX7XGWPbqfNq2FkWOFXg4Be3F eFjy2BogsyiBuzudTb6fKRtlL9RPJHREOvQIbBXqtcz9jYj5G33D9TJ1o+ODvHy8bz zp5qeJhssACEdKh++VBgVNaWez+8VFXRHYO2JOMlHaiHqyaH2OKBMJlI1tLDOibjz/ MItBoNmEt7TNw== From: Arnd Bergmann To: Thomas Zimmermann Cc: Arnd Bergmann , Maarten Lankhorst , Maxime Ripard , David Airlie , Simona Vetter , Jocelyn Falempe , Javier Martinez Canillas , Geert Uytterhoeven , Jani Nikula , Harry Wentland , Masahiro Yamada , Jonathan Cavitt , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] [v2] drm: rework FB_CORE dependency Date: Fri, 15 Nov 2024 17:23:10 +0100 Message-Id: <20241115162323.3555229-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Arnd Bergmann The 'select FB_CORE' statement moved from CONFIG_DRM to DRM_CLIENT_LIB, but there are now configurations that have code calling into fb_core as built-in even though the client_lib itself is a loadable module: x86_64-linux-ld: drivers/gpu/drm/drm_fbdev_shmem.o: in function `drm_fbdev_shmem_driver_fbdev_probe': drm_fbdev_shmem.c:(.text+0x1fc): undefined reference to `fb_deferred_io_init' x86_64-linux-ld: drivers/gpu/drm/drm_fbdev_shmem.o: in function `drm_fbdev_shmem_fb_destroy': drm_fbdev_shmem.c:(.text+0x2e1): undefined reference to `fb_deferred_io_cleanup' ... x86_64-linux-ld: drivers/gpu/drm/drm_fb_helper.o: in function `drm_fb_helper_set_suspend': drm_fb_helper.c:(.text+0x2c6): undefined reference to `fb_set_suspend' x86_64-linux-ld: drivers/gpu/drm/drm_fb_helper.o: in function `drm_fb_helper_resume_worker': drm_fb_helper.c:(.text+0x2e1): undefined reference to `fb_set_suspend' In addition to DRM_CLIENT_LIB, the 'select' needs to be at least in two more parts, DRM_KMS_HELPER and DRM_GEM_SHMEM_HELPER, so add those here. Fixes: dadd28d4142f ("drm/client: Add client-lib module") Signed-off-by: Arnd Bergmann --- v2: keep the select in DRM_CLIENT_LIB, keep alphabetic sorting --- drivers/gpu/drm/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index a4a092ee70d9..410bd6d78408 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -98,6 +98,7 @@ config DRM_KUNIT_TEST config DRM_KMS_HELPER tristate depends on DRM + select FB_CORE if DRM_FBDEV_EMULATION help CRTC helpers for KMS drivers. @@ -371,6 +372,7 @@ config DRM_GEM_DMA_HELPER config DRM_GEM_SHMEM_HELPER tristate depends on DRM && MMU + select FB_CORE if DRM_FBDEV_EMULATION select FB_SYSMEM_HELPERS_DEFERRED if DRM_FBDEV_EMULATION help Choose this if you need the GEM shmem helper functions