Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp9663pxv; Wed, 21 Jul 2021 14:02:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZovA5b239xq5tVJq6Wzyo7CASCBfH4/ZtQ6fBzgh+/zmHP0K56Y2Yj04UAAFBsiDk9dAn X-Received: by 2002:a6b:e70f:: with SMTP id b15mr29029714ioh.67.1626901362526; Wed, 21 Jul 2021 14:02:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626901362; cv=none; d=google.com; s=arc-20160816; b=ffDba+R+6aDXRxjTVJmjPEu3s+suJNZdNGpv8KJUDKa+3gvzHbFVKgXZUs9Pg1OrjS jQyEZQ6FIoQLhXHakYYPYgzR9mq2ve7Bx+Fony+iCErMHw4rgk7KcB494FcMX2Hl2pUn c+AM3vdNddyRVVdGu9BFpJnOpSVlDg0wR7dLSQyqCek0LeLaJOxOqW4RRvdQiNg1BffT pfg3oaKEfn7axpAvAA2UykWxCkaV22F9VI7CdTXTO2OiBreWkCH0HwaXAYKhdTXbrAN8 EDGxrJRu0KLhW0KQ7vJn0a1ruRCXdKpO8F3cTetjv/biX5J0CZE34hv7gP2SB++8zKJo uvDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ZqbfxoCfLO3LzqYnDCHts22MyLUbJxPYGvlHQkWcQjU=; b=tiZbX+Ak0T3FkUCDNchSAPfeG7NljNK6aJSB3sHhmLm2/KYiVwJoi4Q5gsU8E2YIWp 3fpuxlO8Z213MRBX5GgsQEPU8NJoQT351qN3sy9M6KhQpSGdER+fSP6yEF55xaGvGXv6 2nD9y042hgC0Abgo7GAYPBzeVPVGdBs7HRdA+eQygXyPwkLkjcBb50KSESLCEwZosbcN tJDEc1C6UTwSOxDW1O+oZNFbuqEuDPoF8dKPuG1K6CuhtrUUWZ4vno1ayOiR2CF6J5u4 lRi1YQa+SFEV40P7arVrD51uvQAxvD2oI0j6ktKsXGuwze3eDP+smsWSokBROGViYctd /UYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=R7G3apDm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g17si26496864jaq.116.2021.07.21.14.02.27; Wed, 21 Jul 2021 14:02:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=R7G3apDm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239409AbhGUOlk (ORCPT + 99 others); Wed, 21 Jul 2021 10:41:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:34136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232808AbhGUOlk (ORCPT ); Wed, 21 Jul 2021 10:41:40 -0400 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 Cc: Arnd Bergmann , =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Deepak Rawat , Chris Wilson , Anitha Chrisanthus , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org 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 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) 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 -- 2.29.2