From patchwork Tue Aug 1 10:13:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 13336400 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 C5A78C001E0 for ; Tue, 1 Aug 2023 10:18:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8RiAnrMtInNCXONc6rYiwmaccI3pfNylOKXRRhY8gOY=; b=W+TukJT0zwczkI MHKW5woDfh3MKuoSsqfSc3HsBqPPcHdjY5UsEOmhXEj+fKAqEJcgrGRyVtys+/sYqEXTpnRFI0yDc ywflikPqmXFL6retSalWWHlwe35PJQ3NsdYxD/ZlGlHrnfnNeavXMa9C+u43QxDEAX1Mzg0ctiEqM XiaetOlf5mGndCYCe3H1sDCO1Ps/lw2VDPbjJn94DuL/nCFHreh/t0rn0Vu5LmGVAzyPIWgc7tThQ 4Epoc0oc+P9afRnvm6ZBajHaCUrv7bOvNpYYGhOLwbQWJ/7cJl2O51ZpYIpcQ6LftYwO/9DjxDYwL eDhS4P+EEJfLDd7WfAYw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qQmRo-001oQZ-0O; Tue, 01 Aug 2023 10:17:48 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qQmQ9-001m4w-0J; Tue, 01 Aug 2023 10:16:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=p4GF8G36pwLZCVfWUyIFNyu8z8x/NIX9YCQDlW8SZYY=; b=D6oRPmPPjjd6u1kwswQBDYzS7t Gt6tX7wImjWyqedAv2AW348nwciqrOx+jhDzy4iORtoTvSXD5oF/ZIzfHHG6IwYpagIRsCmsIAPoE wDw/D9MrpSlWdjL7/+P8MPb4jtpTx5biergCH4Q+ymP8dQPzKRzn3O8TBeR7ArV13ox6GmpJDJ1i2 lJG4fcHF+jYf+fxobrEWjbNqa/5skkKhQHllJL12e7u4E4ciOWRflLNghjP8eDZX2Nt/I58nN5Ak3 SrMTMRf7bdiZYwCwcgU/2cLnf5inno/W6kJzZFb6m157my/1ky0R0qF4rFC+JzF7zo8mbKJgClagK gGHTHjuw==; Received: from smtp-out1.suse.de ([2001:67c:2178:6::1c]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qQmQ4-00EGhs-2a; Tue, 01 Aug 2023 10:16:03 +0000 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 537D021E52; Tue, 1 Aug 2023 10:15:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1690884957; 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=p4GF8G36pwLZCVfWUyIFNyu8z8x/NIX9YCQDlW8SZYY=; b=fBhvcKfLP+Rlw+ZGy6uqxrhCZIYsNf497pf+pR67fIuHTAuOiauPbmOx1PEAGopQy5w/t7 Uh/oS6/zQ2BvOXHYfyA3/lOS0Pj6sDtToH96fL8RHL/ejXrbV/gIiITeSoZwt9Z1eDaa97 9xI3MlKqxaMp/9wez36KNl+cpbMilrk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1690884957; 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=p4GF8G36pwLZCVfWUyIFNyu8z8x/NIX9YCQDlW8SZYY=; b=o5jhYfDK6rJBQxTjSkV55m8suSFEhppkIVfdLSWSz9+4xmHjYbgv4yUck5S2frJCMFlyqt 49dQEQ+z6OjRcaBQ== 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 1B1FE139BD; Tue, 1 Aug 2023 10:15:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id qM61BV3byGQBXQAAMHmgww (envelope-from ); Tue, 01 Aug 2023 10:15:57 +0000 From: Thomas Zimmermann To: deller@gmx.de, javierm@redhat.com, sam@ravnborg.org Cc: linux-media@vger.kernel.org, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-geode@lists.infradead.org, linux-omap@vger.kernel.org, kvm@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 40/47] fbdev/sstfb: Use fbdev I/O helpers Date: Tue, 1 Aug 2023 12:13:45 +0200 Message-ID: <20230801101541.900-41-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230801101541.900-1-tzimmermann@suse.de> References: <20230801101541.900-1-tzimmermann@suse.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230801_111600_992119_EC45BEA8 X-CRM114-Status: GOOD ( 12.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Set struct fb_ops and with FB_DEFAULT_IO_OPS, fbdev's initializer for I/O memory. Sets the callbacks to the cfb_ and fb_io_ functions. Select the correct modules with Kconfig's FB_IO_HELPERS token. The macro and token set the currently selected values, so there is no functional change. v2: * updated to use _IOMEM_ tokens Signed-off-by: Thomas Zimmermann Reviewed-by: Sam Ravnborg Acked-by: Helge Deller --- drivers/video/fbdev/Kconfig | 4 +--- drivers/video/fbdev/sstfb.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 9b11a394bd82..ba02a31977d4 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -1340,9 +1340,7 @@ config FB_VOODOO1 tristate "3Dfx Voodoo Graphics (sst1) support" depends on FB && PCI depends on FB_DEVICE - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT + select FB_IOMEM_HELPERS select VIDEO_NOMODESET help Say Y here if you have a 3Dfx Voodoo Graphics (Voodoo1/sst1) or diff --git a/drivers/video/fbdev/sstfb.c b/drivers/video/fbdev/sstfb.c index 8d2b1d60dd2e..f8ae54ca0cc3 100644 --- a/drivers/video/fbdev/sstfb.c +++ b/drivers/video/fbdev/sstfb.c @@ -1310,12 +1310,10 @@ static int sstfb_setup(char *options) static const struct fb_ops sstfb_ops = { .owner = THIS_MODULE, + FB_DEFAULT_IOMEM_OPS, .fb_check_var = sstfb_check_var, .fb_set_par = sstfb_set_par, .fb_setcolreg = sstfb_setcolreg, - .fb_fillrect = cfb_fillrect, /* sstfb_fillrect */ - .fb_copyarea = cfb_copyarea, /* sstfb_copyarea */ - .fb_imageblit = cfb_imageblit, .fb_ioctl = sstfb_ioctl, };