Received: by 2002:a05:6358:53a8:b0:117:f937:c515 with SMTP id z40csp3939548rwe; Mon, 17 Apr 2023 06:00:24 -0700 (PDT) X-Google-Smtp-Source: AKy350boUbHX9R5U14rj3vBGnn+K0XY0/3hE5rC/FhIPDPhZ5M+R3hopF6/u269GNnnyKvmvttED X-Received: by 2002:a05:6a20:7351:b0:f0:1b0b:acf7 with SMTP id v17-20020a056a20735100b000f01b0bacf7mr2214037pzc.2.1681736423485; Mon, 17 Apr 2023 06:00:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681736423; cv=none; d=google.com; s=arc-20160816; b=wmumGE2MnpeqIca4OeRNJfAQUbz/VcJf1Hhk+1+Ivw8WroKnDgEd0tbNC7V2GK6FkC 8l+7piNbnW7rmzF/NQMTkeIt6Ngs4ehclqJ47Ugzz/rMjkgzmBa3juqwjT7a5ve2vHm5 32RLGVszAKGbHp5AK7ZlQHSI338xH0NQGJBkBuq5Y3JA7/+aaEotAHwADUZ3j4uIMWnZ x5QhNUaPnU9ri+bjCGE4etFmNJRiZsMEmXG6R9bsdCTK45ZxqDNdJvsfyiB64Ndazufi SkSpHgQJM4S88KFyBw+SJmcq0Lmg+waoC2O9fLUt1J/imTXhm0MDXhkIBaYXbJup6Gjw WARA== 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=clUDjDH/bPWQSIzDszYi3/oWFwNxlrGwwLdQNX68Lw4=; b=iQDtuLbWakaKL8pndFGGd1AE1FVfDMzmxRncfD6Azf5zZsR4C+FBUYusMQixntw2wE cWWhPynrOhjjqxn+GqcBqjfuYFRkltCUPGQXrYJJ1ox2Q6Y6UpcyVj6aGVa9iFNfhaVm OQDsqm50XVApgQBR83t+xxRz9pOc/9ZvcHX9qnoiFNa4YQleLPAbi+KNxhBBhBq2XDsV DUusazc75yP0PthEjr2fog927y2zd+YEr8Sic/2V6U1Ywu/5sh2deZzI1dLDWcIXhkNb b1JYotFnL6ldI25RA2bpXW3u+KIWU4NjOMdbAb0KI79BWJnJLFOWdgJjJeTdKt1osJyA fhqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="sFsu/btv"; 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 62-20020a630441000000b0051453dfd139si12161228pge.613.2023.04.17.06.00.07; Mon, 17 Apr 2023 06:00:23 -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="sFsu/btv"; 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 S231408AbjDQM7w (ORCPT + 99 others); Mon, 17 Apr 2023 08:59:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231334AbjDQM5o (ORCPT ); Mon, 17 Apr 2023 08:57:44 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8C774686; Mon, 17 Apr 2023 05:57:15 -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-out1.suse.de (Postfix) with ESMTPS id EE88921A8E; 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=clUDjDH/bPWQSIzDszYi3/oWFwNxlrGwwLdQNX68Lw4=; b=sFsu/btvzBzKBTdHfoh9f7gkzVBKnILRtZD+kCJlEMjDjzMNkXKXygZ9jYgmbibyQbJsL6 ouw4hAWjPH1AAEGek+OihtCjyCyqdsP/q9hEoijffbZglV0Ke+yUyZWWIDOWqDhIkVkEYE PI+Ypb39XIiS8JMssB8rKjFIK94lwrw= 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=clUDjDH/bPWQSIzDszYi3/oWFwNxlrGwwLdQNX68Lw4=; b=DEhNa/mlpAMmKlm1givPI/g/HB0ECPTaXd4BfaOzWxB90gRjkNnpoRi6MHY/m3Dz1e2PZh kmr7r65eRj2RJWDw== 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 8CD061391A; Mon, 17 Apr 2023 12:57:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id sP5mIR9CPWToWwAAMHmgww (envelope-from ); Mon, 17 Apr 2023 12:57:03 +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 , "James E.J. Bottomley" Subject: [PATCH v3 13/19] arch/parisc: Implement fb_is_primary_device() under arch/parisc Date: Mon, 17 Apr 2023 14:56:45 +0200 Message-Id: <20230417125651.25126-14-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 Move PARISC's implementation of fb_is_primary_device() into the architecture directory. This the place of the declaration and where other architectures implement this function. No functional changes. Signed-off-by: Thomas Zimmermann Cc: "James E.J. Bottomley" Cc: Helge Deller --- arch/parisc/Makefile | 2 ++ arch/parisc/include/asm/fb.h | 2 +- arch/parisc/video/Makefile | 3 +++ arch/parisc/video/fbdev.c | 27 +++++++++++++++++++++++++++ drivers/video/sticore.c | 19 ------------------- include/video/sticore.h | 2 ++ 6 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 arch/parisc/video/Makefile create mode 100644 arch/parisc/video/fbdev.c diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile index 0d049a6f6a60..968ebe17494c 100644 --- a/arch/parisc/Makefile +++ b/arch/parisc/Makefile @@ -119,6 +119,8 @@ export LIBGCC libs-y += arch/parisc/lib/ $(LIBGCC) +drivers-y += arch/parisc/video/ + boot := arch/parisc/boot PALO := $(shell if (which palo 2>&1); then : ; \ diff --git a/arch/parisc/include/asm/fb.h b/arch/parisc/include/asm/fb.h index 55d29c4f716e..0b9a38ced5c8 100644 --- a/arch/parisc/include/asm/fb.h +++ b/arch/parisc/include/asm/fb.h @@ -12,7 +12,7 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE; } -#if defined(CONFIG_FB_STI) +#if defined(CONFIG_STI_CORE) int fb_is_primary_device(struct fb_info *info); #else static inline int fb_is_primary_device(struct fb_info *info) diff --git a/arch/parisc/video/Makefile b/arch/parisc/video/Makefile new file mode 100644 index 000000000000..16a73cce4661 --- /dev/null +++ b/arch/parisc/video/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_STI_CORE) += fbdev.o diff --git a/arch/parisc/video/fbdev.c b/arch/parisc/video/fbdev.c new file mode 100644 index 000000000000..4a0ae08fc75b --- /dev/null +++ b/arch/parisc/video/fbdev.c @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2000 Philipp Rumpf + * Copyright (C) 2001-2020 Helge Deller + * Copyright (C) 2001-2002 Thomas Bogendoerfer + */ + +#include + +#include + +#include