From patchwork Wed Jul 21 15:22:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 483313 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp6297348jao; Wed, 21 Jul 2021 08:22:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDMVtDOttS1g3QVnB5Ze6soBYvA4BHM1psRpMkatMUNxx3unyugdQC6UF/+f5fviJoB7d6 X-Received: by 2002:a63:1266:: with SMTP id 38mr37091419pgs.154.1626880939264; Wed, 21 Jul 2021 08:22:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626880939; cv=none; d=google.com; s=arc-20160816; b=uqx6NH6AUYqEy8oi7LqsKscgY3j597O+kwLpI4UKXBFRlZxXsDdWfh2u2oFr4TgEAj N7mWQccHCE1jD8RpbdcJouIzhmB6PThe49cJUGMsJTe9E5ZmCRkXjaacNFOIbUkNE+q0 vx0/RzcWxlIHscZs45Ez0rHH1wHmcojkHAZiD3dkCuVATjDkp0YpKaLrkJkc48wBvZ+w poXSZL0fsqZm3AICg268iAXRBP6oV+6Fej0ykog1vwM3R21OPTkQG48AuiVG8OA37dRj FRroGo6+2epuHs0w5z3qJH8hfmIwwMaLIEocGVm7jm2Buc0vo0ZV3YWcuAkMHhZ2Kf8s vvnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :delivered-to; bh=ZqbfxoCfLO3LzqYnDCHts22MyLUbJxPYGvlHQkWcQjU=; b=B99Z9+ai1l3LmaboWBuBMFPNehthDlVOTdAdM9sfdqNk2hcobDS5SzDIKAJ8ha7LQl YCphPwcPzLPnIITcpfNE5ukaUsAsqgevE/yv6YfZ1C9CSiKqPfXm+s/WCcRIsraFn2xc iXtQZjJyqaV4qWnviZE3fZOFLiOAJQMN539X2e9ArDA18weiso8sjUvKLNyr3l8V5QZi rhhZkmSGtDkgZnIPK7oY3OuZJNw0oTb+LtViS0Lb0OSbTPTdxbm9G7+mzvo4lmMgVhB2 +BYvfatz7rqvabYS/YupE0bHFhDVlsT+i7RdxAhQQKVkCBdSUV4KbkFmKicxopCk8Qvq VO6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=R7G3apDm; 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=fail (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 my7si15610790pjb.26.2021.07.21.08.22.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jul 2021 08:22:19 -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=fail header.i=@kernel.org header.s=k20201202 header.b=R7G3apDm; 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=fail (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 5F90A6EB21; Wed, 21 Jul 2021 15:22:18 +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 E054A6EB21 for ; Wed, 21 Jul 2021 15:22:16 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 10FD360E0C; Wed, 21 Jul 2021 15:22:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626880936; bh=ntVtjVZCxN1d2TjZ6e0NTRp27wR6oy4/mFhQaboSbjo=; h=From:To:Cc:Subject:Date:From; b=R7G3apDmT1Zaf3nzzVcHkuv4gHOEJQpRu0GRSyuFF6Bn5gIKlwEWrahfZU5PiGtKv wZdVY2j7+4YsMPmQyAzjuNsskDF2xP2WpcTlynHe/nHGs3wcx8i51E/7P5vJD0O1hT 28eQPIxKmJ4Un45w709FaWFSv0NWhPVervQ9/T8NhW6hmXfwqe3rHuH55mkaldTqxb eqdg2tH/2b1nwZpuGpPjaBG/fk8jGdUY2723YHLlMAE9n1NtcqNCfHi4fdABngZb5W Sg0PmiBPyTgpOIoPxXizQfpqkdSyEExtQbpnixI6j/V7diy1SXHccySRpd+dpkvEwB AhNKx3CTQBMPg== From: Arnd Bergmann To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Kees Cook Subject: [PATCH] drm: fb_helper: fix CONFIG_FB dependency Date: Wed, 21 Jul 2021 17:22:01 +0200 Message-Id: <20210721152211.2706171-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: , Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Chris Wilson , Deepak Rawat , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Anitha Chrisanthus , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= 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") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.29.2 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 7ff89690a976..061f4382c796 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -98,7 +98,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