From patchwork Thu Jun 29 11:45:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 13296953 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3520AC04A6A for ; Thu, 29 Jun 2023 12:20:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232605AbjF2MUo (ORCPT ); Thu, 29 Jun 2023 08:20:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232296AbjF2MUF (ORCPT ); Thu, 29 Jun 2023 08:20:05 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 032C33595; Thu, 29 Jun 2023 05:20:02 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 50F121FD67; Thu, 29 Jun 2023 12:20:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1688041201; h=from:from:reply-to: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=Q8/hObzYgPS0TDvHlNkxQWLSeXSJyMjTeBMLqYqFK4w=; b=UPfSiLPg0fPgXj6DVWbIwAx8SsBG5GL3OD/7mLd65j8fwmU+DvPt3QzSfJKiRMSESoepX9 eM5NP2Jl7avazGdPsovrA89jdGZnFXHxxT3O/UdtnP6AQBQmMmB0fb0hdUmBE/YVBR8zBv CQYBtniEcZ5wJ20vfbvuSi9ax+7JLg4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1688041201; h=from:from:reply-to: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=Q8/hObzYgPS0TDvHlNkxQWLSeXSJyMjTeBMLqYqFK4w=; b=L3PyCj5jKQ5vE7MYne4nWCsAiDM0bCWXnp9ECQ/thRxLRW/+klbPAr42RqiLHE8RIsU2gZ akbya49XJu79VVCQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id A0F3313905; Thu, 29 Jun 2023 12:20:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id uIppJvB2nWRlVAAAMHmgww (envelope-from ); Thu, 29 Jun 2023 12:20:00 +0000 From: Thomas Zimmermann To: arnd@arndb.de, deller@gmx.de, daniel@ffwll.ch, airlied@gmail.com Cc: linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-efi@vger.kernel.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-hyperv@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-staging@lists.linux.dev, linux-arch@vger.kernel.org, Thomas Zimmermann , Ard Biesheuvel , Maarten Lankhorst , Maxime Ripard , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Greg Kroah-Hartman , Javier Martinez Canillas , Randy Dunlap , Andy Shevchenko Subject: [PATCH 09/12] drivers: Add dependencies on CONFIG_ARCH_HAS_SCREEN_INFO Date: Thu, 29 Jun 2023 13:45:48 +0200 Message-ID: <20230629121952.10559-10-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230629121952.10559-1-tzimmermann@suse.de> References: <20230629121952.10559-1-tzimmermann@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Various files within drivers/ depend on the declaration of the screen_info variable. Add this information to Kconfig. In the case of the dummy console, the dependency exists only on ARM. Ignore it on !ARM platforms. Signed-off-by: Thomas Zimmermann Cc: Ard Biesheuvel Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: David Airlie Cc: Daniel Vetter Cc: "K. Y. Srinivasan" Cc: Haiyang Zhang Cc: Wei Liu Cc: Dexuan Cui Cc: Greg Kroah-Hartman Cc: Helge Deller Cc: Arnd Bergmann Cc: Javier Martinez Canillas Cc: Randy Dunlap Cc: Andy Shevchenko --- drivers/firmware/Kconfig | 1 + drivers/firmware/efi/Kconfig | 1 + drivers/gpu/drm/Kconfig | 1 + drivers/hv/Kconfig | 1 + drivers/video/console/Kconfig | 2 ++ drivers/video/fbdev/Kconfig | 4 ++++ 6 files changed, 10 insertions(+) diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 0432737bbb8b4..65bbf7422f1db 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -228,6 +228,7 @@ config QCOM_SCM_DOWNLOAD_MODE_DEFAULT config SYSFB bool + depends on ARCH_HAS_SCREEN_INFO select BOOT_VESA_SUPPORT config SYSFB_SIMPLEFB diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig index 043ca31c114eb..963d305421e50 100644 --- a/drivers/firmware/efi/Kconfig +++ b/drivers/firmware/efi/Kconfig @@ -225,6 +225,7 @@ config EFI_DISABLE_PCI_DMA config EFI_EARLYCON def_bool y depends on SERIAL_EARLYCON && !ARM && !IA64 + depends on ARCH_HAS_SCREEN_INFO select FONT_SUPPORT select ARCH_USE_MEMREMAP_PROT diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index afb3b2f5f4253..63dfc3391d2ff 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -366,6 +366,7 @@ source "drivers/gpu/drm/sprd/Kconfig" config DRM_HYPERV tristate "DRM Support for Hyper-V synthetic video device" depends on DRM && PCI && MMU && HYPERV + depends on ARCH_HAS_SCREEN_INFO select DRM_KMS_HELPER select DRM_GEM_SHMEM_HELPER help diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig index 00242107d62e0..3730c9b42a9bd 100644 --- a/drivers/hv/Kconfig +++ b/drivers/hv/Kconfig @@ -6,6 +6,7 @@ config HYPERV tristate "Microsoft Hyper-V client drivers" depends on (X86 && X86_LOCAL_APIC && HYPERVISOR_GUEST) \ || (ACPI && ARM64 && !CPU_BIG_ENDIAN) + depends on ARCH_HAS_SCREEN_INFO select PARAVIRT select X86_HV_CALLBACK_VECTOR if X86 select OF_EARLY_FLATTREE if OF diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index a2a88d42edf0c..b39e2ae039783 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -10,6 +10,7 @@ config VGA_CONSOLE depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !SUPERH && \ (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \ !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !S390 && !UML + depends on ARCH_HAS_SCREEN_INFO select APERTURE_HELPERS if (DRM || FB || VFIO_PCI_CORE) default y help @@ -48,6 +49,7 @@ config SGI_NEWPORT_CONSOLE config DUMMY_CONSOLE bool + depends on ARCH_HAS_SCREEN_INFO || !ARM default y config DUMMY_CONSOLE_COLUMNS diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index cecf15418632d..e11d85e802bc7 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -655,6 +655,7 @@ config FB_UVESA config FB_VESA bool "VESA VGA graphics support" depends on (FB = y) && X86 + depends on ARCH_HAS_SCREEN_INFO select APERTURE_HELPERS select FB_CFB_FILLRECT select FB_CFB_COPYAREA @@ -669,6 +670,7 @@ config FB_VESA config FB_EFI bool "EFI-based Framebuffer Support" depends on (FB = y) && !IA64 && EFI + depends on ARCH_HAS_SCREEN_INFO select APERTURE_HELPERS select DRM_PANEL_ORIENTATION_QUIRKS select FB_CFB_FILLRECT @@ -1089,6 +1091,7 @@ config FB_CARILLO_RANCH config FB_INTEL tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support" depends on FB && PCI && X86 && AGP_INTEL && EXPERT + depends on ARCH_HAS_SCREEN_INFO select FB_MODE_HELPERS select FB_CFB_FILLRECT select FB_CFB_COPYAREA @@ -2185,6 +2188,7 @@ config FB_BROADSHEET config FB_HYPERV tristate "Microsoft Hyper-V Synthetic Video support" depends on FB && HYPERV + depends on ARCH_HAS_SCREEN_INFO select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT