From patchwork Mon Sep 27 14:28:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 514723 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp4174184jao; Mon, 27 Sep 2021 07:28:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJykVAos7oP5WMM+lvv4BMGXDTgoF3p7OeWcJmp1N0p1oJiHLqb6wAk3/D/58ZmTkgHAr0sK X-Received: by 2002:a63:4506:: with SMTP id s6mr9173016pga.211.1632752903632; Mon, 27 Sep 2021 07:28:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632752903; cv=none; d=google.com; s=arc-20160816; b=uDmJH50FQP+t8sqdCXKmvlMB/lcYkMPKtNQyUklSYMcruLOXd2hC8k8HK/zvIb4jon CtzmZGo8zh7EBi0qxDC+bQnyNCOImr4z46MTKOk5dPPuxu8lndy8m1EW7iJ6ZQdV4BDD WVxWWnYq6FDoG+m+bT8jCruShe7WldZd9Wuh621o7D/sIcY8GnmPdmYM6Hn0NmLw7gd2 eWIHPguoXpcOyfFRN+Q1ksSMzgFYrDQ+fvEbYmnHLA3mN279HBbaUmJ0tMO0Eyux32xg pSBKeUo5aVRRVpg+iErKmV/D4E0690BD+kjaXDx3gq7qewDzKoHos+iy5rGYnHvngNq5 EpRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :delivered-to; bh=FhlecZqBTGRr/A+J3hko7Lj0Zh49LkJiHK35Qf9i1ns=; b=dZofQVu75voU0X0Hf04qZxrmNRxXEC8888YdWyMH/4P2iohd+2r8YRxezPED8xkJ4R cFMlBrm/f5Gk/x6pCySAHrCffnpsstiw7v+GO2S0UqqwtBBs4jtuojE3F1genjM6j8HC 5XjojQHxrOKPcwbJ/aU0lIzzs5I0RazEzTXIJjM1ctYKjzYIan/BRn1+LYijrBIwh8o4 q+XjBHLL3j0Cp+wiiw3+6R7ihMvznLqVkSm6huCbu14xZIc8U5UHoJhJ6kWsM++ra59V KbX1kWSQtv3FANbYwONlVKZDvx8h/Qw0yVpiGEVQ/Got562KOGhHWGRsC+K/98KoV9T4 kmxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lxzA0fXg; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id x8si20468801plv.121.2021.09.27.07.28.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Sep 2021 07:28:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lxzA0fXg; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7A2F189FA5; Mon, 27 Sep 2021 14:28:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id A463B89FA5 for ; Mon, 27 Sep 2021 14:28:21 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 5E11F610E8; Mon, 27 Sep 2021 14:28:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632752901; bh=5KL+JiULkFsiAbh9kDxX+k4YOM3LnpWkWceqNENywSw=; h=From:To:Cc:Subject:Date:From; b=lxzA0fXgPKw9xlD13FdD6gFz9FpAdgQRFrWR+k070lCUmY6OqQObR/WU+zN8Nxw1j tuLdF/3BruQ7i8vZpaMF36FkOVkQLMRbPMqH1hAMcGMGbS0saXphLZBxvliAtwngLw ZuUjUQjmbwcCZrKIL0wwd1qpopCSbpecqoN+ZlufludMS8FApmE/bpzt0GphapokiW ouRk4y1TQmsOTVPC7zIiyNZYRgLM2Q1kRYJYadH+AUi/97Sv4gWaNKKUEqrKb0p+DK P15IRtkAeY6wi+c2yMiltL+SSFZX8/PFijBf1Dz2mo4jGnDWAj0CDnq2oV7zupvFK6 axD5GNXZZxTrQ== From: Arnd Bergmann To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Kees Cook Cc: Arnd Bergmann , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] [RESEND] drm: fb_helper: fix CONFIG_FB dependency Date: Mon, 27 Sep 2021 16:28:02 +0200 Message-Id: <20210927142816.2069269-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 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 With CONFIG_FB=m and CONFIG_DRM=y, we get a link error in the fb helper: aarch64-linux-ld: drivers/gpu/drm/drm_fb_helper.o: in function `drm_fb_helper_alloc_fbi': (.text+0x10cc): undefined reference to `framebuffer_alloc' Tighten the dependency so it is only allowed in the case that DRM can link against FB. Fixes: f611b1e7624c ("drm: Avoid circular dependencies for CONFIG_FB") Link: https://lore.kernel.org/all/20210721152211.2706171-1-arnd@kernel.org/ Signed-off-by: Arnd Bergmann --- I posted this in July, the patch is still required and should work on its own. --- drivers/gpu/drm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.29.2 Reviewed-by: Kees Cook Acked-by: Jani Nikula Reviewed-by: Javier Martinez Canillas diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index cea777ae7fb9..9199f53861ca 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -103,7 +103,7 @@ config DRM_DEBUG_DP_MST_TOPOLOGY_REFS config DRM_FBDEV_EMULATION bool "Enable legacy fbdev support for your modesetting driver" depends on DRM - depends on FB + depends on FB=y || FB=DRM select DRM_KMS_HELPER select FB_CFB_FILLRECT select FB_CFB_COPYAREA