From patchwork Tue Aug 1 10:13:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 13336380 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 3687AC001DF for ; Tue, 1 Aug 2023 10:17:33 +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=YE4qdhDwdKK/vCFdBPb654YQbf4lPnx13bvA+VLe4wU=; b=P/t+oS3aHG7ShR FKqPKGTFzce5FyiuAMHiT3yAayY6YryNQ5qJKkNm/qIFqtBqKf3njTnPC1kQr7Av6AEspr+RAI4oJ RWcwaWRuGXmei1ACZa1cJR9lEpNJjOSNsubY9gt3TUHXZgCmvoZzpRT5ZTaUpIx6Th0PEtTSaYw+P J5h9Eky3dwy1c3CRLrIOzEBg5RiRM4S4Y+ClwMgsh1w8FrMewm5tPNTlM+ze2xzGHkW6KaOwLVA4J oaYHKoLeW7Qy1G30aR/Uxc2nRoblqrkgahA2qzWzSwdVTVNMNo6QqBQDEV+EYKFA4TDZ8HQZxdQ2f PvtDTrmdqIi2chc5pYgQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qQmR3-001nL8-0W; Tue, 01 Aug 2023 10:17:01 +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 1qQmQ4-001lxw-0Z; Tue, 01 Aug 2023 10:16:00 +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=G0qWhQUeICgKv1jW/QBP/nUzWvIZZ+MJDvwZBGJpCIc=; b=pUSDa1lC8L5d4d/fdLSCk8cnYV sWT19NeIAfmRgzFa6R31Wdi2SAxD36A36fz6KF0WRdfmEvolk8AyqEEP+gysfs0uC+L3+L6smUT1d PDGG+/mtHfCJW98olgFGDcAmL9wb3z94kwkFGQpbTPLNLqRFRxLm/GZO1wFpdpKVexjTKHIREhpvV jBRWfFbzTL8g60aFZTWVGA624J7zR0PV5Z4cre7braDX5uVC2jwItJxvxFhZVyM+wBwmAfiTVb//x UynwA94zkmvGQYBJtV0Bx7CKKMrsZ38fyjRgmNYzdZxE5jbCiURmNv+Wzo3KNz5TMd2Utxs8zzTkI kHy6jBEg==; Received: from smtp-out2.suse.de ([195.135.220.29]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qQmQ0-00EGef-2L; Tue, 01 Aug 2023 10:15:58 +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-out2.suse.de (Postfix) with ESMTPS id 154401F8B2; Tue, 1 Aug 2023 10:15:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1690884954; 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=G0qWhQUeICgKv1jW/QBP/nUzWvIZZ+MJDvwZBGJpCIc=; b=cNXkYf5JJWA0ap5GsrtOoU9g2puoKuoiULdIMAbMt2mne9Ko+TZuHH3zVavwAhtQmqtP9k pklTvkOR5w1gkOw+66ayLln3ciIZi99J0lPZonVaGUxq6Cj66Y1IN5kpmLB5v2syA9YPUu feawe+M0XXvbXHCqDPuTtstKLE4RLPQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1690884954; 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=G0qWhQUeICgKv1jW/QBP/nUzWvIZZ+MJDvwZBGJpCIc=; b=A4bbU/gvR0T4e0RGq/SHEgL7fIxrde7XoLAhE8j+wcuWHHjRVvuHG70scO7+NxbF9c/CxZ UPj+qsyq3JJ/0fAw== 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 CAAB2139BD; Tue, 1 Aug 2023 10:15:53 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id QGSKMFnbyGQBXQAAMHmgww (envelope-from ); Tue, 01 Aug 2023 10:15:53 +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 27/47] fbdev/ocfb: Use fbdev I/O helpers Date: Tue, 1 Aug 2023 12:13:32 +0200 Message-ID: <20230801101541.900-28-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_111556_911116_5731E28B X-CRM114-Status: GOOD ( 13.01 ) 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/ocfb.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 74ec729cd5ef..b358cb5f87eb 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -672,9 +672,7 @@ config FB_PVR2 config FB_OPENCORES tristate "OpenCores VGA/LCD core 2.0 framebuffer support" depends on FB && HAS_DMA - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT + select FB_IOMEM_HELPERS help This enables support for the OpenCores VGA/LCD core. diff --git a/drivers/video/fbdev/ocfb.c b/drivers/video/fbdev/ocfb.c index 7ebe794583e1..7dc305c67af8 100644 --- a/drivers/video/fbdev/ocfb.c +++ b/drivers/video/fbdev/ocfb.c @@ -287,10 +287,8 @@ static int ocfb_init_var(struct ocfb_dev *fbdev) static const struct fb_ops ocfb_ops = { .owner = THIS_MODULE, + FB_DEFAULT_IOMEM_OPS, .fb_setcolreg = ocfb_setcolreg, - .fb_fillrect = cfb_fillrect, - .fb_copyarea = cfb_copyarea, - .fb_imageblit = cfb_imageblit, }; static int ocfb_probe(struct platform_device *pdev)