From patchwork Sat Jul 1 21:44:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 115063 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp11258733vqr; Sat, 1 Jul 2023 14:49:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6h+mW8Cxif0feozYPa75sPPNPUUAjXchBYIZi+gWESpCK6164O6Bq9xYZqJu1ad+nzVaEW X-Received: by 2002:a05:6a20:144e:b0:126:e6f1:7104 with SMTP id a14-20020a056a20144e00b00126e6f17104mr5531817pzi.45.1688248193640; Sat, 01 Jul 2023 14:49:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688248193; cv=none; d=google.com; s=arc-20160816; b=Vz04avPjHvWc/caTQWnwtl20eMco/A6Trm56JSTvNkuCZPUIP7zCOc5c7aepj1qsTa GpPSqHHsb8XCw/YjQoT6w3TGctvZdFV7gmRG1zeAkEQSfPn+hFm4lr7TvqLzVUh16Vop Nmy8lRGO6t2hIF4HX/24Jf5nGupiExHFV9sqtbvRL6CEK2zNSsXT8ZkKLBfVHK9bVVxp b0qX2EPt+8Sd02tRTcrZKq0ODKnOZKJmzVYOR41o5WhdM/if+P2izgKQJV/PdbTHt58T 4xuqfyx4pF/ZrCpg3wyy4+p2Bevp6Evcykedell895TySD8RwjqdLsI43Gz4AaSS1eX9 /+pQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CVp6/k8iItY4Fh6tN5JBgOkeUtA2k8q9cd5KwLvRASM=; fh=LTs5Qrnc43/bqx1R72T0wec4hVQ0nAhO+z+w27z91EY=; b=pxTcjw85cyh3wEoALzJmIaT3Z1z7XiqUS577YJgGL2HWI/AtsMl876AuiMfR7Tr3Oy GvTMdOh5TWGt0zlTa3i2MGsMgdJpqxgU8BUQQLOC/IBP0l2mXquy9Uh8jm6RA2syC+7j LJGACyj086CH2mt7skq9nuq4+IKxjTUEGpoRmNjeaFPH3L++U09wd0xmxuYzwJsIZx5R +qRCOzSR+yVPaYBgbv8rMQ7/aK4BT5I/v0e8Ej8HliElEr1GENnMdI7Lvar4RECW9cYH htErca8+7UC94hQEVSD4rRcmg1X3sf+YnQG2OxPU/bZ1otTzzHzBDR6nfdzqzfjKs4BK oMDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=eQh6g9WM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c20-20020a6566d4000000b0055aed54f22bsi10809950pgw.710.2023.07.01.14.49.39; Sat, 01 Jul 2023 14:49:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=eQh6g9WM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229671AbjGAVqE (ORCPT + 99 others); Sat, 1 Jul 2023 17:46:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229446AbjGAVqC (ORCPT ); Sat, 1 Jul 2023 17:46:02 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66F901996 for ; Sat, 1 Jul 2023 14:45:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688247916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CVp6/k8iItY4Fh6tN5JBgOkeUtA2k8q9cd5KwLvRASM=; b=eQh6g9WMHzalF5+MuTk5vXUs48/u42il59kWIJFrnP9bnI+6JQGYMBm/8TUEeVRnDxEdu1 zxV7WZTATuDSAbrFL1bjBr87ZjSt2doffsp4wmDlfebC2QJxe+PhXv/qw1+pumIvz/oxSf vnrhpHnxU2xr+Y+p55NDNBCytaro+0g= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-284-zm_JtsJ2Mt6FoL99klT8ew-1; Sat, 01 Jul 2023 17:45:15 -0400 X-MC-Unique: zm_JtsJ2Mt6FoL99klT8ew-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-3fbaade0c71so18296875e9.2 for ; Sat, 01 Jul 2023 14:45:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688247914; x=1690839914; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CVp6/k8iItY4Fh6tN5JBgOkeUtA2k8q9cd5KwLvRASM=; b=hwzaU+Fy7Ik0mh4yStxRcYww/LU1Y0bx1xmGEhLdcCfGfDfJNYALyt5Lg3OEhO1pIL g/aIl5dvupmmEH9rlX4WaAGXjCV658SiGY6AsywDOOOYJW9Qww/u+ZM6/paDe8PXth6D BuEtDjWIKiJL9DeH3+B4r7kvyDYC/GHg5bty77llkX/Z2IJKQzvIgMEIJNXSWXUCmVaN vT+P3DvDnhDfz/Gz37wAAfKcF4b6dJW67AktW3t8/dfQTXU3t10yuT0OXyKJUfBaxmj8 mykpNUld6BYfHFwhLLEo18kBOtNZi2kjMcflFr14wuCx3Po6zNc2qyqevq2UTE6zjHG9 bgCg== X-Gm-Message-State: AC+VfDwAhinCGflmo4gR7A++0Zg8/TbOrWHH845yTHcWtoW2UzeWqu0z hYaMXDBrEQEBvYIFj/B4uuU2dyfHUv5U6pLuFWXO6ALYkV+NF53BimGabY3jQVPS77krp9Z8J4H eRcFzAIxFxX3h4xvlfsLDii7oQ5K2YPgb6AqCV6FDdZJZYq9JCcwdS2AySCJtt+WBQDtEHzo1DH 4L8AWKEp0= X-Received: by 2002:a1c:7706:0:b0:3fb:b61f:c719 with SMTP id t6-20020a1c7706000000b003fbb61fc719mr4959583wmi.33.1688247914193; Sat, 01 Jul 2023 14:45:14 -0700 (PDT) X-Received: by 2002:a1c:7706:0:b0:3fb:b61f:c719 with SMTP id t6-20020a1c7706000000b003fbb61fc719mr4959554wmi.33.1688247913775; Sat, 01 Jul 2023 14:45:13 -0700 (PDT) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id o10-20020a1c750a000000b003fbc0ea491dsm6913800wmc.40.2023.07.01.14.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jul 2023 14:45:13 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Thomas Zimmermann , Geert Uytterhoeven , Arnd Bergmann , Javier Martinez Canillas , Andy Shevchenko , Borislav Petkov , Daniel Vetter , Dave Hansen , Greg Kroah-Hartman , "H. Peter Anvin" , Helge Deller , Ingo Molnar , Randy Dunlap , Sam Ravnborg , Thomas Gleixner , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, x86@kernel.org Subject: [PATCH v2 1/2] fbdev: Split frame buffer support in FB and FB_CORE symbols Date: Sat, 1 Jul 2023 23:44:50 +0200 Message-ID: <20230701214503.550549-2-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230701214503.550549-1-javierm@redhat.com> References: <20230701214503.550549-1-javierm@redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770256538317262442?= X-GMAIL-MSGID: =?utf-8?q?1770256538317262442?= Currently the CONFIG_FB option has to be enabled even if no legacy fbdev drivers are needed (e.g: only to have support for framebuffer consoles). The DRM subsystem has a fbdev emulation layer, but depends on CONFIG_FB and so it can only be enabled if that dependency is enabled as well. That means fbdev drivers have to be explicitly disabled if users want to enable CONFIG_FB, only to use fbcon and/or the DRM fbdev emulation layer. This patch introduces a non-visible CONFIG_FB_CORE symbol that could be enabled just to have core support needed for CONFIG_DRM_FBDEV_EMULATION, allowing CONFIG_FB to be disabled (and automatically disabling all the fbdev drivers). Signed-off-by: Javier Martinez Canillas --- Changes in v2: - Keep "depends on FB" for FB_DDC, FB_HECUBA, FB_SVGALIB, FB_MACMODES, FB_BACKLIGHT, FB_MODE_HELPERS and FB_TILEBLITTING (Arnd Bergmann). - Don't change the fb.o object name (Arnd Bergmann). - Make FB_CORE a non-visible Kconfig symbol instead (Thomas Zimmermann). arch/x86/Makefile | 2 +- arch/x86/video/Makefile | 2 +- drivers/video/console/Kconfig | 2 +- drivers/video/fbdev/Kconfig | 40 +++++++++++++++++++------------ drivers/video/fbdev/core/Makefile | 2 +- 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index b39975977c03..89a02e69be5f 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -259,7 +259,7 @@ drivers-$(CONFIG_PCI) += arch/x86/pci/ # suspend and hibernation support drivers-$(CONFIG_PM) += arch/x86/power/ -drivers-$(CONFIG_FB) += arch/x86/video/ +drivers-$(CONFIG_FB_CORE) += arch/x86/video/ #### # boot loader support. Several targets are kept for legacy purposes diff --git a/arch/x86/video/Makefile b/arch/x86/video/Makefile index 11640c116115..5ebe48752ffc 100644 --- a/arch/x86/video/Makefile +++ b/arch/x86/video/Makefile @@ -1,2 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_FB) += fbdev.o +obj-$(CONFIG_FB_CORE) += fbdev.o diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index a2a88d42edf0..1b5a319971ed 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -72,7 +72,7 @@ config DUMMY_CONSOLE_ROWS config FRAMEBUFFER_CONSOLE bool "Framebuffer Console support" - depends on FB && !UML + depends on FB_CORE && !UML select VT_HW_CONSOLE_BINDING select CRC32 select FONT_SUPPORT diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index cecf15418632..da6f7d588f17 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -6,8 +6,12 @@ config FB_NOTIFY bool +menuconfig FB_CORE + tristate "Core support for frame buffer devices" + menuconfig FB - tristate "Support for frame buffer devices" + tristate "Support for frame buffer device drivers" + select FB_CORE select FB_NOTIFY select VIDEO_CMDLINE help @@ -33,6 +37,12 @@ menuconfig FB for more information. + This enables support for native frame buffer device (fbdev) drivers. + + The DRM subsystem provides support for emulated frame buffer devices + on top of KMS drivers, but this option allows legacy fbdev drivers to + be enabled as well. + Say Y here and to the driver for your graphics board below if you are compiling a kernel for a non-x86 architecture. @@ -44,7 +54,7 @@ menuconfig FB config FIRMWARE_EDID bool "Enable firmware EDID" - depends on FB + depends on FB_CORE help This enables access to the EDID transferred from the firmware. On the i386, this is from the Video BIOS. Enable this if DDC/I2C @@ -59,7 +69,7 @@ config FIRMWARE_EDID config FB_DEVICE bool "Provide legacy /dev/fb* device" - depends on FB + select FB_CORE default y help Say Y here if you want the legacy /dev/fb* device file and @@ -75,7 +85,7 @@ config FB_DDC config FB_CFB_FILLRECT tristate - depends on FB + depends on FB_CORE help Include the cfb_fillrect function for generic software rectangle filling. This is used by drivers that don't provide their own @@ -83,7 +93,7 @@ config FB_CFB_FILLRECT config FB_CFB_COPYAREA tristate - depends on FB + depends on FB_CORE help Include the cfb_copyarea function for generic software area copying. This is used by drivers that don't provide their own (accelerated) @@ -91,7 +101,7 @@ config FB_CFB_COPYAREA config FB_CFB_IMAGEBLIT tristate - depends on FB + depends on FB_CORE help Include the cfb_imageblit function for generic software image blitting. This is used by drivers that don't provide their own @@ -99,7 +109,7 @@ config FB_CFB_IMAGEBLIT config FB_CFB_REV_PIXELS_IN_BYTE bool - depends on FB + depends on FB_CORE help Allow generic frame-buffer functions to work on displays with 1, 2 and 4 bits per pixel depths which has opposite order of pixels in @@ -107,7 +117,7 @@ config FB_CFB_REV_PIXELS_IN_BYTE config FB_SYS_FILLRECT tristate - depends on FB + depends on FB_CORE help Include the sys_fillrect function for generic software rectangle filling. This is used by drivers that don't provide their own @@ -115,7 +125,7 @@ config FB_SYS_FILLRECT config FB_SYS_COPYAREA tristate - depends on FB + depends on FB_CORE help Include the sys_copyarea function for generic software area copying. This is used by drivers that don't provide their own (accelerated) @@ -123,7 +133,7 @@ config FB_SYS_COPYAREA config FB_SYS_IMAGEBLIT tristate - depends on FB + depends on FB_CORE help Include the sys_imageblit function for generic software image blitting. This is used by drivers that don't provide their own @@ -162,22 +172,22 @@ endchoice config FB_SYS_FOPS tristate - depends on FB + depends on FB_CORE config FB_DEFERRED_IO bool - depends on FB + depends on FB_CORE config FB_IO_HELPERS bool - depends on FB + depends on FB_CORE select FB_CFB_COPYAREA select FB_CFB_FILLRECT select FB_CFB_IMAGEBLIT config FB_SYS_HELPERS bool - depends on FB + depends on FB_CORE select FB_SYS_COPYAREA select FB_SYS_FILLRECT select FB_SYS_FOPS @@ -185,7 +195,7 @@ config FB_SYS_HELPERS config FB_SYS_HELPERS_DEFERRED bool - depends on FB + depends on FB_CORE select FB_DEFERRED_IO select FB_SYS_HELPERS diff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefile index 9150bafd9e89..4c2e4a026d12 100644 --- a/drivers/video/fbdev/core/Makefile +++ b/drivers/video/fbdev/core/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_FB_NOTIFY) += fb_notify.o -obj-$(CONFIG_FB) += fb.o +obj-$(CONFIG_FB_CORE) += fb.o fb-y := fb_backlight.o \ fb_info.o \ fbmem.o fbmon.o fbcmap.o \