From patchwork Fri Oct 29 12:02:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12592601 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA453C433EF for ; Fri, 29 Oct 2021 12:03:14 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 84EB7610EA for ; Fri, 29 Oct 2021 12:03:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 84EB7610EA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CF6306EA54; Fri, 29 Oct 2021 12:03:13 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id C468E6EA54 for ; Fri, 29 Oct 2021 12:03:12 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 1150E610EA; Fri, 29 Oct 2021 12:03:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635508992; bh=2IyJsR8W6tA2KwPjXHjKViZaH1uY8qqJVOQ80yvHAQc=; h=From:To:Cc:Subject:Date:From; b=dvQh47BaFWFWxweGZR9oJCcL+p3cOgpXRp307Sk6XP8m0IBbZi7r9Yl5fOsmW8rqh oWOGhvZmgo2wd1FNkBzk2XnTLKocaJAzbq/gq0IYTAvOY2dKo/mTC2olFWAtgTeOUa CZdR8tPd7/gdznNhTq+IrWuGY/LxKyF4Ax+yifcaOfc2lHf3BREZIw9GWKW830lj13 SQd5ITBddonm9nwOIUaTsHNBBqrOBZt+kAAjYsm+gyKwqkcs5tdK0xKoh/NJd7FLYY lkXoU4n1ejLlihwprDIALH6f1sTvgSzyvu8vl4W85hx/FIUhW2y2r8AIWozzBbdLgC kl5AlBQh1NllA== From: Arnd Bergmann To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter Cc: Arnd Bergmann , "Acked-by : Jani Nikula" , Javier Martinez Canillas , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , Kees Cook , Lukas Bulwahn , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm: fb_helper: improve CONFIG_FB dependency Date: Fri, 29 Oct 2021 14:02:38 +0200 Message-Id: <20211029120307.1407047-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 My previous patch correctly addressed the possible link failure, but as Jani points out, the dependency is now stricter than it needs to be. Change it again, to allow DRM_FBDEV_EMULATION to be used when DRM_KMS_HELPER and FB are both loadable modules and DRM is linked into the kernel. As a side-effect, the option is now only visible when at least one DRM driver makes use of DRM_KMS_HELPER. This is better, because the option has no effect otherwise. Fixes: 606b102876e3 ("drm: fb_helper: fix CONFIG_FB dependency") Suggested-by: Acked-by: Jani Nikula Reviewed-by: Javier Martinez Canillas Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/Kconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index c08860db2520..d2e6d8ce5000 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -117,9 +117,8 @@ config DRM_DEBUG_MODESET_LOCK config DRM_FBDEV_EMULATION bool "Enable legacy fbdev support for your modesetting driver" - depends on DRM - depends on FB=y || FB=DRM - select DRM_KMS_HELPER + depends on DRM_KMS_HELPER + depends on FB=y || FB=DRM_KMS_HELPER select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT