[v2,04/32] fbdev/vfb: Initialize fb_ops with fbdev macros

Message ID	20231127131655.4020-5-tzimmermann@suse.de
State	New
Headers	show Authentication-Results: smtp.subspace.kernel.org; dkim=none From: Thomas Zimmermann <tzimmermann@suse.de> To: javierm@redhat.com, deller@gmx.de Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Thomas Zimmermann <tzimmermann@suse.de> Subject: [PATCH v2 04/32] fbdev/vfb: Initialize fb_ops with fbdev macros Date: Mon, 27 Nov 2023 14:15:33 +0100 Message-ID: <20231127131655.4020-5-tzimmermann@suse.de> In-Reply-To: <20231127131655.4020-1-tzimmermann@suse.de> References: <20231127131655.4020-1-tzimmermann@suse.de> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	fbdev: Modularize helpers for struct fb_ops \| expand [v2,00/32] fbdev: Modularize helpers for struct fb_ops [v2,01/32] fbdev/acornfb: Fix name of fb_ops initializer macro [v2,02/32] fbdev/sm712fb: Use correct initializer macros for struct fb_ops [v2,03/32] fbdev/vfb: Set FBINFO_VIRTFB flag [v2,04/32] fbdev/vfb: Initialize fb_ops with fbdev macros [v2,05/32] fbdev/arcfb: Set FBINFO_VIRTFB flag [v2,06/32] fbdev/arcfb: Use generator macros for deferred I/O [v2,07/32] auxdisplay/cfag12864bfb: Set FBINFO_VIRTFB flag [v2,08/32] auxdisplay/cfag12864bfb: Initialize fb_ops with fbdev macros [v2,09/32] auxdisplay/ht16k33: Set FBINFO_VIRTFB flag [v2,10/32] auxdisplay/ht16k33: Initialize fb_ops with fbdev macros [v2,11/32] hid/picolcd_fb: Set FBINFO_VIRTFB flag [v2,12/32] fbdev/sh_mobile_lcdcfb: Set FBINFO_VIRTFB flag [v2,13/32] fbdev/sh_mobile_lcdcfb: Initialize fb_ops with fbdev macros [v2,14/32] fbdev/smscufx: Select correct helpers [v2,15/32] fbdev/udlfb: Select correct helpers [v2,16/32] fbdev/au1200fb: Set FBINFO_VIRTFB flag [v2,17/32] fbdev/au1200fb: Initialize fb_ops with fbdev macros [v2,18/32] fbdev/ps3fb: Set FBINFO_VIRTFB flag [v2,19/32] fbdev/ps3fb: Initialize fb_ops with fbdev macros [v2,20/32] media/ivtvfb: Initialize fb_ops to fbdev I/O-memory helpers [v2,21/32] fbdev/clps711x-fb: Initialize fb_ops with fbdev macros [v2,22/32] fbdev/vt8500lcdfb: Initialize fb_ops with fbdev macros [v2,23/32] fbdev/wm8505fb: Initialize fb_ops to fbdev I/O-memory helpers [v2,24/32] fbdev/cyber2000fb: Initialize fb_ops with fbdev macros [v2,25/32] staging/sm750fb: Declare fb_ops as constant [v2,26/32] staging/sm750fb: Initialize fb_ops with fbdev macros [v2,27/32] fbdev: Rename FB_SYS_FOPS token to FB_SYSMEM_FOPS [v2,28/32] fbdev: Remove trailing whitespaces [v2,29/32] fbdev: Push pgprot_decrypted() into mmap implementations [v2,30/32] fbdev: Move default fb_mmap code into helper function [v2,31/32] fbdev: Warn on incorrect framebuffer access [v2,32/32] fbdev: Remove default file-I/O implementations

Message ID

20231127131655.4020-5-tzimmermann@suse.de

State

New

Headers

From: Thomas Zimmermann <tzimmermann@suse.de>
To: javierm@redhat.com,
	deller@gmx.de
Cc: linux-fbdev@vger.kernel.org,
	dri-devel@lists.freedesktop.org,
	Thomas Zimmermann <tzimmermann@suse.de>
Subject: [PATCH v2 04/32] fbdev/vfb: Initialize fb_ops with fbdev macros
Date: Mon, 27 Nov 2023 14:15:33 +0100
Message-ID: <20231127131655.4020-5-tzimmermann@suse.de>
In-Reply-To: <20231127131655.4020-1-tzimmermann@suse.de>
References: <20231127131655.4020-1-tzimmermann@suse.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

fbdev: Modularize helpers for struct fb_ops | expand

Commit Message

Thomas Zimmermann Nov. 27, 2023, 1:15 p.m. UTC

Initialize the instance of struct fb_ops with fbdev initializer
macros for framebuffers in virtual address space. Set the read/write,
draw and mmap callbacks to the correct implementation and avoid
implicit defaults. Also select the necessary helpers in Kconfig.

Fbdev drivers sometimes rely on the callbacks being NULL for a
default I/O-memory-based implementation to be invoked; hence
requiring the I/O helpers to be built in any case. Setting all
callbacks in all drivers explicitly will allow to make the I/O
helpers optional. This benefits systems that do not use these
functions.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
---
 drivers/video/fbdev/Kconfig | 5 +----
 drivers/video/fbdev/vfb.c   | 7 ++-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 53693c826ebdd..63956382ffb65 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -1800,10 +1800,7 @@  config FB_DA8XX
 config FB_VIRTUAL
 	tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
 	depends on FB
-	select FB_SYS_FILLRECT
-	select FB_SYS_COPYAREA
-	select FB_SYS_IMAGEBLIT
-	select FB_SYS_FOPS
+	select FB_SYSMEM_HELPERS
 	help
 	  This is a `virtual' frame buffer device. It operates on a chunk of
 	  unswappable kernel memory instead of on the memory of a graphics
diff --git a/drivers/video/fbdev/vfb.c b/drivers/video/fbdev/vfb.c
index c748b9311fb12..f6140f247e4b0 100644
--- a/drivers/video/fbdev/vfb.c
+++ b/drivers/video/fbdev/vfb.c
@@ -80,15 +80,12 @@  static int vfb_mmap(struct fb_info *info,
 
 static const struct fb_ops vfb_ops = {
 	.owner		= THIS_MODULE,
-	.fb_read        = fb_sys_read,
-	.fb_write       = fb_sys_write,
+	__FB_DEFAULT_SYSMEM_OPS_RDWR,
 	.fb_check_var	= vfb_check_var,
 	.fb_set_par	= vfb_set_par,
 	.fb_setcolreg	= vfb_setcolreg,
 	.fb_pan_display	= vfb_pan_display,
-	.fb_fillrect	= sys_fillrect,
-	.fb_copyarea	= sys_copyarea,
-	.fb_imageblit	= sys_imageblit,
+	__FB_DEFAULT_SYSMEM_OPS_DRAW,
 	.fb_mmap	= vfb_mmap,
 };

[v2,04/32] fbdev/vfb: Initialize fb_ops with fbdev macros

Commit Message

Patch