Received: by 2002:a05:6358:53a8:b0:117:f937:c515 with SMTP id z40csp3938449rwe; Mon, 17 Apr 2023 05:59:32 -0700 (PDT) X-Google-Smtp-Source: AKy350ZTHv2PtpxXeDqyGOXA3RgJz0y5nDuVBdgxuyaiti2X6HL9C4Oo/ieGE8+Zdbe/rbtMo0Je X-Received: by 2002:a05:6a00:c87:b0:63d:2343:f9b with SMTP id a7-20020a056a000c8700b0063d23430f9bmr4339946pfv.19.1681736371832; Mon, 17 Apr 2023 05:59:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681736371; cv=none; d=google.com; s=arc-20160816; b=iXgFdQE/b2KyY1G14skq7G9SmvLdbp4/y0MmV4/XtTd1GU1CL3eDIrIPh+2ngE/8Ik 9oHafGLbO9aZP6aG3MthOM4BJuc8+a3VwObRrP9pHXIENClRdKE1M7OP3WG/sp5IyH3Z RN+nq6M/5suiWHyxa/QPux94tZfA0DPwYduxghK4g2fO5gh3Hzsj1RCERvMcMTiZ4Gqn 3vergK5r/sPCGngpR+ZOW+6VM8bJLFIWT5dPjoXg9ZHdeTk3310THEEg4VMliQ7+L8J2 qJKa6jUkE0IO+xB6Ftp1cQCo4rKVBncX3vbqwZM+07iO/Ybv8SCdJZAtk1dY/m47v/1e CkPw== 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:dkim-signature; bh=YNg0lz+7KBHL0Jy2/T4bI8sg52Xj/iVvmLTbUyEhSFc=; b=HzBUpqsatPFVFA6Dt1p7RDncCQJQEM090WPi6nyy4m3qAx65fy2qxU7TdsBF9Eb5s6 Eu23bjwPoAnpS2TGM3rCDfJJ7uYyACc4zNehhXBTbe19sx8OmkHxAHrNM0fyY1L+q6Xf nD9ydEsIrx5mxa2iGJFJSXLGjhu7RaVheSYKJV0qnQMXprhvq45fhA6uWt7qluX0PM1i oO3fNxPnC7K+6P+B8gA26GGht4EcLc6WNuG7RT75LnBOk0Crr0TEUlsiATm2n3qZAndB SMT4FlQmuCFVm+n0oaBbWIDCDRN7SLU4RhGftjvxsXaO/Z87e6viapjc3n3IS9wr+PBV drXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=1A7fXiy1; dkim=neutral (no key) header.i=@suse.de; 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=suse.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z10-20020aa79e4a000000b0062ae6345c78si11635704pfq.403.2023.04.17.05.59.20; Mon, 17 Apr 2023 05:59:31 -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=@suse.de header.s=susede2_rsa header.b=1A7fXiy1; dkim=neutral (no key) header.i=@suse.de; 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=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231192AbjDQM57 (ORCPT + 99 others); Mon, 17 Apr 2023 08:57:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230047AbjDQM5W (ORCPT ); Mon, 17 Apr 2023 08:57:22 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ACBE69ECC; Mon, 17 Apr 2023 05:57:04 -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 192D11FE0D; Mon, 17 Apr 2023 12:57:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1681736223; 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=YNg0lz+7KBHL0Jy2/T4bI8sg52Xj/iVvmLTbUyEhSFc=; b=1A7fXiy1zKPCuEHooMeIVWVvJlKA/ju1B4NXN7LwNgEtx/G2NE2eLoHXc3y2k3Ny8vAC3o bQE8YX9wQ63rTt4qUtIF2zXbQQrnHf3lgS8GpEd9Sq9lWO5AVYvQOKkWBhc3m+Aq4eOa3k zlJZR9DLxIUgT46xqhjJXNjAvf7hF6c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1681736223; 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=YNg0lz+7KBHL0Jy2/T4bI8sg52Xj/iVvmLTbUyEhSFc=; b=8/AlEZDQXt3r2Q36jm3rhtdSm0bNHjwRZn287hcP5LcsmvipnpFbxL//4nCdb/g1kzIQvk jnC4JSw7Kh0YkwBg== 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 B1AB61391A; Mon, 17 Apr 2023 12:57:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id SGqRKh5CPWToWwAAMHmgww (envelope-from ); Mon, 17 Apr 2023 12:57:02 +0000 From: Thomas Zimmermann To: arnd@arndb.de, daniel.vetter@ffwll.ch, deller@gmx.de, javierm@redhat.com, gregkh@linuxfoundation.org Cc: linux-arch@vger.kernel.org, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, x86@kernel.org, Thomas Zimmermann Subject: [PATCH v3 11/19] video: Move HP PARISC STI core code to shared location Date: Mon, 17 Apr 2023 14:56:43 +0200 Message-Id: <20230417125651.25126-12-tzimmermann@suse.de> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230417125651.25126-1-tzimmermann@suse.de> References: <20230417125651.25126-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE 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 STI core files have been located in console and fbdev code. Move the source code and header to the directories for video helpers. Also update the config and build rules such that the code depends on the config symbol CONFIG_STI_CORE, which STI console and STI framebuffer select automatically. Cleans up the console makefile and prepares PARISC to implement fb_is_primary_device() within the arch/ directory. No functional changes. Signed-off-by: Thomas Zimmermann --- drivers/video/Kconfig | 7 +++++++ drivers/video/Makefile | 1 + drivers/video/console/Kconfig | 1 + drivers/video/console/Makefile | 4 +--- drivers/video/console/sticon.c | 2 +- drivers/video/fbdev/Kconfig | 3 +-- drivers/video/fbdev/stifb.c | 2 +- drivers/video/{console => }/sticore.c | 2 +- {drivers/video/fbdev => include/video}/sticore.h | 0 9 files changed, 14 insertions(+), 8 deletions(-) rename drivers/video/{console => }/sticore.c (99%) rename {drivers/video/fbdev => include/video}/sticore.h (100%) diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index bf05363d8906..8b2b9ac37c3d 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -11,6 +11,13 @@ config APERTURE_HELPERS Support tracking and hand-over of aperture ownership. Required by graphics drivers for firmware-provided framebuffers. +config STI_CORE + bool + depends on PARISC + help + STI refers to the HP "Standard Text Interface" which is a set of + BIOS routines contained in a ROM chip in HP PA-RISC based machines. + config VIDEO_CMDLINE bool diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 831c9fa57a6c..6bbc03950899 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_APERTURE_HELPERS) += aperture.o +obj-$(CONFIG_STI_CORE) += sticore.o obj-$(CONFIG_VGASTATE) += vgastate.o obj-$(CONFIG_VIDEO_CMDLINE) += cmdline.o obj-$(CONFIG_VIDEO_NOMODESET) += nomodeset.o diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 22cea5082ac4..a2a88d42edf0 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -141,6 +141,7 @@ config STI_CONSOLE depends on PARISC && HAS_IOMEM select FONT_SUPPORT select CRC32 + select STI_CORE default y help The STI console is the builtin display/keyboard on HP-PARISC diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile index db07b784bd2c..fd79016a0d95 100644 --- a/drivers/video/console/Makefile +++ b/drivers/video/console/Makefile @@ -5,8 +5,6 @@ obj-$(CONFIG_DUMMY_CONSOLE) += dummycon.o obj-$(CONFIG_SGI_NEWPORT_CONSOLE) += newport_con.o -obj-$(CONFIG_STI_CONSOLE) += sticon.o sticore.o +obj-$(CONFIG_STI_CONSOLE) += sticon.o obj-$(CONFIG_VGA_CONSOLE) += vgacon.o obj-$(CONFIG_MDA_CONSOLE) += mdacon.o - -obj-$(CONFIG_FB_STI) += sticore.o diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c index 89ad7ade6cf9..d11cfd2d68b5 100644 --- a/drivers/video/console/sticon.c +++ b/drivers/video/console/sticon.c @@ -50,7 +50,7 @@ #include -#include "../fbdev/sticore.h" +#include