From patchwork Thu Jun 29 22:51:03 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: 13297404 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 954E3EB64D9 for ; Thu, 29 Jun 2023 22:51:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 901E710E0C9; Thu, 29 Jun 2023 22:51:27 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id D978B10E0BD for ; Thu, 29 Jun 2023 22:51:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688079083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YAXyw5cSv19lHG5FT64qf0eoLGlTjWx7HZp8kfcWz1U=; b=DoZZk7Nh/Kvun1JD93PX+mRx+pWzLHqkLiSwwnBlJ2rOj4APx6IFXk0UDEqC1cplUGQkIK 7yg9IJNC3TSsewyy5UNzn83TZ0m3iCHwZzSZTmgdSE17s5ci5guGOU70RR/unb2WTsM895 ej5N2wwnC++y6N+glDOd1xg+yxCZDDw= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-284-tbPBN0juP2SbLnDb1UOnUw-1; Thu, 29 Jun 2023 18:51:22 -0400 X-MC-Unique: tbPBN0juP2SbLnDb1UOnUw-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-313fe11f5e2so759076f8f.0 for ; Thu, 29 Jun 2023 15:51:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688079081; x=1690671081; 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=YAXyw5cSv19lHG5FT64qf0eoLGlTjWx7HZp8kfcWz1U=; b=gicU0tRnTVWgaINy7GJ8rLTt2UCU6O8Vb2BBmQ1MzLvVcH1kGNxHAh7hJkA3fAN09r 5GrND/ZjMKhydtG4ZlxyCBgWsF31niArY3Y9TMYxghffVnb67qh+fjduGnsfEq0haQii 8IRyGLGRZMFkrkLs7Fp0Cq2b2W6uyxlnO+QR0LBLTqScHBSuQgSbLcw/5fUXkJzEQjwL wuy4O6uo72P70ZOqBjcHd4hGKLkA7GYFhbIg10OjT1BMM+rrRz4BsyuLyK+HEFK7RNMN DLWo1k3RI+ahXCkpM9AxOwUVb6BzjQbinURoKXVWNmRekmB90gEWjDV4bYI8t+glTdVd OOfA== X-Gm-Message-State: ABy/qLb8ZADjipA8xLcdTvQaKhDL9QPm9ubo8NYWYQWwgFUNJcykUQPO AeFFtIHOKK/NgS6UzAJz0glGhbgUDjblAR4HiCUt/XKUiVqARv9EnC9HXH7Hv67FIu7vs5eX2Ag G4Qb5fzkPKn/p4ggrz1set5WD2y3k X-Received: by 2002:a5d:4688:0:b0:313:f8ca:989f with SMTP id u8-20020a5d4688000000b00313f8ca989fmr740608wrq.10.1688079080966; Thu, 29 Jun 2023 15:51:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlFZ7b9QmVUmLNGAXuU3X5c4NLO4EQJ8+1xJQDGKxGNR00wBDY9lQ9qneS1jBj0+hGrRnG7Zzg== X-Received: by 2002:a5d:4688:0:b0:313:f8ca:989f with SMTP id u8-20020a5d4688000000b00313f8ca989fmr740589wrq.10.1688079080610; Thu, 29 Jun 2023 15:51:20 -0700 (PDT) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id i6-20020adff306000000b00311339f5b06sm16795690wro.57.2023.06.29.15.51.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jun 2023 15:51:20 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Subject: [PATCH 1/2] fbdev: Split frame buffer support in FB and FB_CORE symbols Date: Fri, 30 Jun 2023 00:51:03 +0200 Message-ID: <20230629225113.297512-2-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230629225113.297512-1-javierm@redhat.com> References: <20230629225113.297512-1-javierm@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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: x86@kernel.org, linux-fbdev@vger.kernel.org, Randy Dunlap , Arnd Bergmann , Greg Kroah-Hartman , Helge Deller , Dave Hansen , Javier Martinez Canillas , dri-devel@lists.freedesktop.org, Ingo Molnar , Borislav Petkov , Thomas Zimmermann , "H. Peter Anvin" , Geert Uytterhoeven , Thomas Gleixner , Andy Shevchenko , Sam Ravnborg Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 CONFIG_FB_CORE option that could be enabled just to have the core support needed for CONFIG_DRM_FBDEV_EMULATION, allowing CONFIG_FB to be disabled (and automatically disabling all fbdev drivers). Signed-off-by: Javier Martinez Canillas --- arch/x86/Makefile | 2 +- arch/x86/video/Makefile | 2 +- drivers/video/console/Kconfig | 2 +- drivers/video/fbdev/Kconfig | 62 ++++++++++++++++++------------- drivers/video/fbdev/core/Makefile | 14 +++---- 5 files changed, 47 insertions(+), 35 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..74d7a305657a 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -6,10 +6,8 @@ config FB_NOTIFY bool -menuconfig FB - tristate "Support for frame buffer devices" - select FB_NOTIFY - select VIDEO_CMDLINE +menuconfig FB_CORE + tristate "Core support for frame buffer devices" help The frame buffer device provides an abstraction for the graphics hardware. It represents the frame buffer of some video hardware and @@ -33,6 +31,20 @@ menuconfig FB for more information. + This options enables the core support for frame buffer devices. + +menuconfig FB + tristate "Support for frame buffer device drivers" + depends on FB_CORE + select FB_NOTIFY + select VIDEO_CMDLINE + help + 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 +56,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 +71,7 @@ config FIRMWARE_EDID config FB_DEVICE bool "Provide legacy /dev/fb* device" - depends on FB + depends on FB_CORE default y help Say Y here if you want the legacy /dev/fb* device file and @@ -69,13 +81,13 @@ config FB_DEVICE config FB_DDC tristate - depends on FB + depends on FB_CORE select I2C_ALGOBIT select I2C 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 +95,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 +103,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 +111,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 +119,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 +127,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 +135,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 +174,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,34 +197,34 @@ 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 config FB_HECUBA tristate - depends on FB + depends on FB_CORE depends on FB_DEFERRED_IO config FB_SVGALIB tristate - depends on FB + depends on FB_CORE help Common utility functions useful to fbdev drivers of VGA-based cards. config FB_MACMODES tristate - depends on FB + depends on FB_CORE config FB_BACKLIGHT tristate - depends on FB + depends on FB_CORE select BACKLIGHT_CLASS_DEVICE config FB_MODE_HELPERS bool "Enable Video Mode Handling Helpers" - depends on FB + depends on FB_CORE help This enables functions for handling video modes using the Generalized Timing Formula and the EDID parser. A few drivers rely @@ -222,7 +234,7 @@ config FB_MODE_HELPERS config FB_TILEBLITTING bool "Enable Tile Blitting Support" - depends on FB + depends on FB_CORE help This enables tile blitting. Tile blitting is a drawing technique where the screen is divided into rectangular sections (tiles), whereas diff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefile index 9150bafd9e89..88ef39dad03b 100644 --- a/drivers/video/fbdev/core/Makefile +++ b/drivers/video/fbdev/core/Makefile @@ -1,22 +1,22 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_FB_NOTIFY) += fb_notify.o -obj-$(CONFIG_FB) += fb.o -fb-y := fb_backlight.o \ +obj-$(CONFIG_FB_CORE) += fb_core.o +fb_core-y := fb_backlight.o \ fb_info.o \ fbmem.o fbmon.o fbcmap.o \ modedb.o fbcvt.o fb_cmdline.o fb_io_fops.o -fb-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o -fb-$(CONFIG_FB_DEVICE) += fb_chrdev.o \ +fb_core-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o +fb_core-$(CONFIG_FB_DEVICE) += fb_chrdev.o \ fb_procfs.o \ fbsysfs.o ifeq ($(CONFIG_FRAMEBUFFER_CONSOLE),y) -fb-y += fbcon.o bitblit.o softcursor.o +fb_core-y += fbcon.o bitblit.o softcursor.o ifeq ($(CONFIG_FB_TILEBLITTING),y) -fb-y += tileblit.o +fb_core-y += tileblit.o endif ifeq ($(CONFIG_FRAMEBUFFER_CONSOLE_ROTATION),y) -fb-y += fbcon_rotate.o fbcon_cw.o fbcon_ud.o \ +fb_core-y += fbcon_rotate.o fbcon_cw.o fbcon_ud.o \ fbcon_ccw.o endif endif From patchwork Thu Jun 29 22:51:04 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: 13297403 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A4DD7EB64D9 for ; Thu, 29 Jun 2023 22:51:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 66A4F10E0BD; Thu, 29 Jun 2023 22:51:27 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5399C10E0B6 for ; Thu, 29 Jun 2023 22:51:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688079084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h2j2ItE1hrzXRdyDj1d7Zvc9rzISUnAdMoZSXdbcCVc=; b=DM2Nj4xm5yKg+xSU81R0JWsBgSm2hbKEgMa4fW+q3SW9uK3ELYQS1NBm3wmVi0m6VzPflj Y4BFjqB1V877V1UNj/YZrnhSN6dji3aMk0Gs/jD4k40PfIwtntdcLFd2DUZDZ0PmxTr9xi Nu/1g9JFreHEUExl9UiHeEtQxjDkB5s= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-588-CJbga1WUOWSOH118I0KlVQ-1; Thu, 29 Jun 2023 18:51:23 -0400 X-MC-Unique: CJbga1WUOWSOH118I0KlVQ-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-313f2430134so597029f8f.3 for ; Thu, 29 Jun 2023 15:51:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688079082; x=1690671082; 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=h2j2ItE1hrzXRdyDj1d7Zvc9rzISUnAdMoZSXdbcCVc=; b=EE20MY4tFw8YthKiZU4dtd16vAG3wb9NLo6494W8o1VzdFDjeeqVF+FFz/p9luUa4i E4PX6b6gRjMmHOfV7X77Dvouasl/u0rrmljvra3+S351sWNg2+bimq2xJTKvbLqK+mUs 58JILBNkBqg6H9BB/Tr3xNtZp3AV7wmzCtPcW9/3b4GSugmYpQNgaK7zLbaTUJtB9YWK +4C3YtPBpwJCufDihO8fqPkmJH3WywfwpMWTeB3LAxL4kAIAHMHKdk5Oco4VvWd9urEB /yuiUWCB6EWsJCNR31MaYdFCDLdHfOy17nDh36rtvgu+vU5ijqC/7eQXAQihqtdcdwLH fobQ== X-Gm-Message-State: ABy/qLZ7u5oKmNX5BZnyl8CQW3DFcI2mWN/dhyO7R8L28WSLM/firsjs pYx3xiOuUTasHmQBRh1TIM8PuusYiGy5b4WXHhXnHB1jRx2bo8sg8DRfBF3qAnCSIFYQ3zM7xG2 wvEJOxl1rgANZS2A+LSKAhROxJ7uV X-Received: by 2002:adf:e5c4:0:b0:313:f59f:986d with SMTP id a4-20020adfe5c4000000b00313f59f986dmr442364wrn.65.1688079082053; Thu, 29 Jun 2023 15:51:22 -0700 (PDT) X-Google-Smtp-Source: APBJJlHd4GmNb5anZfo6xpKRMdPTwJkkfzyxrFg+R0KEc4n5GMsAHWEd5iM2tVUcAeQlbNqHWI4p8Q== X-Received: by 2002:adf:e5c4:0:b0:313:f59f:986d with SMTP id a4-20020adfe5c4000000b00313f59f986dmr442352wrn.65.1688079081824; Thu, 29 Jun 2023 15:51:21 -0700 (PDT) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id i6-20020adff306000000b00311339f5b06sm16795690wro.57.2023.06.29.15.51.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jun 2023 15:51:21 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Subject: [PATCH 2/2] drm: Make fbdev emulation depend on FB_CORE instead of FB Date: Fri, 30 Jun 2023 00:51:04 +0200 Message-ID: <20230629225113.297512-3-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230629225113.297512-1-javierm@redhat.com> References: <20230629225113.297512-1-javierm@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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: Thomas Zimmermann , Javier Martinez Canillas , Maxime Ripard , Geert Uytterhoeven , dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Now that the fbdev core has been split in FB_CORE and FB, make DRM fbdev emulation layer to just depend on the former. This allows to disable the CONFIG_FB option if is not needed, which will avoid the need to explicitly disable each of the legacy fbdev drivers. Signed-off-by: Javier Martinez Canillas --- 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 afb3b2f5f425..6ecb984d213a 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -132,7 +132,7 @@ config DRM_DEBUG_MODESET_LOCK config DRM_FBDEV_EMULATION bool "Enable legacy fbdev support for your modesetting driver" depends on DRM_KMS_HELPER - depends on FB=y || FB=DRM_KMS_HELPER + depends on FB_CORE=y || FB=DRM_KMS_HELPER select FRAMEBUFFER_CONSOLE if !EXPERT select FRAMEBUFFER_CONSOLE_DETECT_PRIMARY if FRAMEBUFFER_CONSOLE default y