[42/47] fbdev/sunxvr2500: Use fbdev I/O helpers

Message ID	20230728182234.10680-43-tzimmermann@suse.de
State	Accepted
Commit	4921d03421341788253563647a14d32c22147de9
Headers	show Return-Path: <linux-media-owner@vger.kernel.org> From: Thomas Zimmermann <tzimmermann@suse.de> 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 <tzimmermann@suse.de> Subject: [PATCH 42/47] fbdev/sunxvr2500: Use fbdev I/O helpers Date: Fri, 28 Jul 2023 18:40:25 +0200 Message-ID: <20230728182234.10680-43-tzimmermann@suse.de> In-Reply-To: <20230728182234.10680-1-tzimmermann@suse.de> References: <20230728182234.10680-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	fbdev: Use I/O helpers \| expand [00/47] fbdev: Use I/O helpers [01/47] media/vivid: Use fbdev I/O helpers [02/47] fbdev/acornfb: Use fbdev I/O helpers [03/47] fbdev/asiliantfb: Use fbdev I/O helpers [04/47] fbdev/atmel_lcdfb: Use fbdev I/O helpers [05/47] fbdev/aty128fb: Use fbdev I/O helpers [06/47] fbdev/carminefb: Use fbdev I/O helpers [07/47] fbdev/chipsfb: Use fbdev I/O helpers [08/47] fbdev/da8xx-fb: Use fbdev I/O helpers [09/47] fbdev/efifb: Use fbdev I/O helpers [10/47] fbdev/fm2fb: Use fbdev I/O helpers [11/47] fbdev/fsl-diu-fb: Use fbdev I/O helpers [12/47] fbdev/g364fb: Use fbdev I/O helpers [13/47] fbdev/geode/gx1fb: Use fbdev I/O helpers [14/47] fbdev/geode/gxfb: Use fbdev I/O helpers [15/47] fbdev/geode/lxfb: Use fbdev I/O helpers [16/47] fbdev/goldfishfb: Use fbdev I/O helpers [17/47] fbdev/grvga: Use fbdev I/O helpers [18/47] fbdev/gxt4500: Use fbdev I/O helpers [19/47] fbdev/i740fb: Use fbdev I/O helpers [20/47] fbdev/imxfb: Use fbdev I/O helpers [21/47] fbdev/kyro: Use fbdev I/O helpers [22/47] fbdev/macfb: Use fbdev I/O helpers [23/47] fbdev/maxinefb: Use fbdev I/O helpers [24/47] fbdev/mb862xxfb: Use fbdev I/O helpers [25/47] fbdev/mmpfb: Use fbdev I/O helpers [26/47] fbdev/mx3fb: Use fbdev I/O helpers [27/47] fbdev/ocfb: Use fbdev I/O helpers [28/47] fbdev/offb: Use fbdev I/O helpers [29/47] fbdev/omapfb: Use fbdev I/O helpers [30/47] fbdev/platinumfb: Use fbdev I/O helpers [31/47] fbdev/pmag-aa-fb: Use fbdev I/O helpers [32/47] fbdev/pmag-ba-fb: Use fbdev I/O helpers [33/47] fbdev/pmag-b-fb: Use fbdev I/O helpers [34/47] fbdev/pxa168fb: Use fbdev I/O helpers [35/47] fbdev/pxafb: Use fbdev I/O helpers [36/47] fbdev/q40fb: Use fbdev I/O helpers [37/47] fbdev/s3cfb: Use fbdev I/O helpers [38/47] fbdev/sh7760fb: Use fbdev I/O helpers [39/47] fbdev/simplefb: Use fbdev I/O helpers [40/47] fbdev/sstfb: Use fbdev I/O helpers [41/47] fbdev/sunxvr1000: Use fbdev I/O helpers [42/47] fbdev/sunxvr2500: Use fbdev I/O helpers [43/47] fbdev/uvesafb: Use fbdev I/O helpers [44/47] fbdev/valkyriefb: Use fbdev I/O helpers [45/47] fbdev/vesafb: Use fbdev I/O helpers [46/47] fbdev/xilinxfb: Use fbdev I/O helpers [47/47] vfio-dev/mdpy-fb: Use fbdev I/O helpers

Message ID

20230728182234.10680-43-tzimmermann@suse.de

State

Accepted

Commit

4921d03421341788253563647a14d32c22147de9

Headers

From: Thomas Zimmermann <tzimmermann@suse.de>
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 <tzimmermann@suse.de>
Subject: [PATCH 42/47] fbdev/sunxvr2500: Use fbdev I/O helpers
Date: Fri, 28 Jul 2023 18:40:25 +0200
Message-ID: <20230728182234.10680-43-tzimmermann@suse.de>
In-Reply-To: <20230728182234.10680-1-tzimmermann@suse.de>
References: <20230728182234.10680-1-tzimmermann@suse.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

fbdev: Use I/O helpers | expand

Commit Message

Thomas Zimmermann July 28, 2023, 4:40 p.m. UTC

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.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/video/fbdev/Kconfig      | 4 +---
 drivers/video/fbdev/sunxvr2500.c | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 9b3433194eeb..72ddeb296568 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -617,9 +617,7 @@  config FB_XVR500
 config FB_XVR2500
 	bool "Sun XVR-2500 3DLABS Wildcat support"
 	depends on (FB = y) && PCI && SPARC64
-	select FB_CFB_FILLRECT
-	select FB_CFB_COPYAREA
-	select FB_CFB_IMAGEBLIT
+	select FB_IO_HELPERS
 	select VIDEO_NOMODESET
 	help
 	  This is the framebuffer device for the Sun XVR-2500 and similar
diff --git a/drivers/video/fbdev/sunxvr2500.c b/drivers/video/fbdev/sunxvr2500.c
index 07ebf6941708..6c1bb8948686 100644
--- a/drivers/video/fbdev/sunxvr2500.c
+++ b/drivers/video/fbdev/sunxvr2500.c
@@ -66,10 +66,8 @@  static int s3d_setcolreg(unsigned regno,
 
 static const struct fb_ops s3d_ops = {
 	.owner			= THIS_MODULE,
+	FB_DEFAULT_IO_OPS,
 	.fb_setcolreg		= s3d_setcolreg,
-	.fb_fillrect		= cfb_fillrect,
-	.fb_copyarea		= cfb_copyarea,
-	.fb_imageblit		= cfb_imageblit,
 };
 
 static int s3d_set_fbinfo(struct s3d_info *sp)

[42/47] fbdev/sunxvr2500: Use fbdev I/O helpers

Commit Message

Patch