From patchwork Fri Jan 27 09:36:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13118314 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 30642C54EAA for ; Fri, 27 Jan 2023 09:36:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 526FC10E434; Fri, 27 Jan 2023 09:36:38 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2A9C710E434 for ; Fri, 27 Jan 2023 09:36:37 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A93DE61A74; Fri, 27 Jan 2023 09:36:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3989C433EF; Fri, 27 Jan 2023 09:36:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674812196; bh=wlz6HIVQ/GgIj0YbTS0RXKypfcVwy2vvEGBqBClsFuo=; h=From:To:Cc:Subject:Date:From; b=Tir3d55g29BmdExqeS9YYdmYN3bB9BIsEcfWaB4gHjRQgIO8DPGdyUbu8a/h5jel7 wqVAdY0QxPgzZ8nAJrUxKX2rkHn0ipkyfFP73Eg4NTygD1wosC1bd5jRxEdSmWMzNq PUGnUrXSQ2AMGsUKfkRZsrWwOUOt7C89Ou7P4a6320syjhHDnqOH1KHDRKYDFMAwMP dEMELwYPsl0pM0VEfTXtHIT3HgN1pF4TDrlJ57QDkqodr9+Gp+bXLa2RRI6EfUyQ/J mT8tXwQvo5u9E+ImLVjmuudBFc69W/JU8nIwqBH79cGtmkHp37C8hqFqG040dnIh9E G+fwgYcmFJh3g== From: Arnd Bergmann To: Oded Gabbay , Jeffrey Hugo , Jacek Lawrynowicz , Dave Airlie , Thomas Zimmermann , Melissa Wen Subject: [PATCH] accel: work around DRM_ACCEL dependencies Date: Fri, 27 Jan 2023 10:36:20 +0100 Message-Id: <20230127093631.2132187-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.0 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: , Cc: Daniel Vetter , dri-devel@lists.freedesktop.org, Arnd Bergmann , linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Arnd Bergmann At the moment, accel drivers can be built-in even with CONFIG_DRM=m, but this causes a link failure: x86_64-linux-ld: drivers/accel/ivpu/ivpu_drv.o: in function `ivpu_dev_init': ivpu_drv.c:(.text+0x1535): undefined reference to `drmm_kmalloc' x86_64-linux-ld: ivpu_drv.c:(.text+0x1562): undefined reference to `drmm_kmalloc' x86_64-linux-ld: drivers/accel/ivpu/ivpu_drv.o: in function `ivpu_remove': ivpu_drv.c:(.text+0x1faa): undefined reference to `drm_dev_unregister' x86_64-linux-ld: drivers/accel/ivpu/ivpu_drv.o: in function `ivpu_probe': ivpu_drv.c:(.text+0x1fef): undefined reference to `__devm_drm_dev_alloc' This could be avoided by making DRM_ACCEL a tristate symbol, which would mean that every ACCEL driver is guarantee to be able to link against DRM as well. However, having both as =m causes another link failure because the DRM core code also links against the accel driver: x86_64-linux-ld: drivers/gpu/drm/drm_drv.o: in function `drm_minor_register': drm_drv.c:(.text+0x259): undefined reference to `accel_debugfs_init' x86_64-linux-ld: drm_drv.c:(.text+0x298): undefined reference to `accel_minor_replace' I think it will be necessary to establish a link hierarchy between drm.ko and drm_accel.ko to avoid circular dependencies like this, but until then the only way that both can be used is to have both subsystems built into the kernel. Enforce this using a Kconfig dependency. Fixes: 8bf4889762a8 ("drivers/accel: define kconfig and register a new major") Signed-off-by: Arnd Bergmann --- drivers/accel/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/accel/Kconfig b/drivers/accel/Kconfig index 834863902e16..dd18d3b2028c 100644 --- a/drivers/accel/Kconfig +++ b/drivers/accel/Kconfig @@ -8,7 +8,7 @@ # menuconfig DRM_ACCEL bool "Compute Acceleration Framework" - depends on DRM + depends on DRM=y help Framework for device drivers of compute acceleration devices, such as, but not limited to, Machine-Learning and Deep-Learning