Thomas Zimmermann 40b57d
From cd9f7f7ac5932129fe81b4c7559cfcb226ec7c5c Mon Sep 17 00:00:00 2001
Thomas Zimmermann 40b57d
From: Thomas Zimmermann <tzimmermann@suse.de>
Thomas Zimmermann 40b57d
Date: Tue, 1 Feb 2022 12:53:05 +0100
Thomas Zimmermann 40b57d
Subject: drm/fb-helper: Mark screen buffers in system memory with
Thomas Zimmermann 40b57d
 FBINFO_VIRTFB
Thomas Zimmermann 40b57d
Git-commit: cd9f7f7ac5932129fe81b4c7559cfcb226ec7c5c
Thomas Zimmermann 40b57d
Patch-mainline: v5.18-rc1
Thomas Zimmermann 40b57d
References: bsc#1152472
Thomas Zimmermann 40b57d
Thomas Zimmermann 40b57d
Mark screen buffers in system memory with FBINFO_VIRTFB. Otherwise, fbdev
Thomas Zimmermann 40b57d
deferred I/O marks mmap'ed areas of system memory with VM_IO. (There's an
Thomas Zimmermann 40b57d
inverse relationship between the two flags.)
Thomas Zimmermann 40b57d
Thomas Zimmermann 40b57d
For shadow buffers, also set the FBINFO_READS_FAST hint.
Thomas Zimmermann 40b57d
Thomas Zimmermann 40b57d
v3:
Thomas Zimmermann 40b57d
	* change FB_ to FBINFO_ in commit description
Thomas Zimmermann 40b57d
v2:
Thomas Zimmermann 40b57d
	* updated commit description (Daniel)
Thomas Zimmermann 40b57d
	* added Fixes tag
Thomas Zimmermann 40b57d
Thomas Zimmermann 40b57d
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Thomas Zimmermann 40b57d
Fixes: d536540f304c ("drm/fb-helper: Add generic fbdev emulation .fb_probe function")
Thomas Zimmermann 40b57d
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Thomas Zimmermann 40b57d
Cc: dri-devel@lists.freedesktop.org
Thomas Zimmermann 40b57d
Cc: <stable@vger.kernel.org> # v4.19+
Thomas Zimmermann 40b57d
Link: https://patchwork.freedesktop.org/patch/msgid/20220201115305.9333-1-tzimmermann@suse.de
Thomas Zimmermann 40b57d
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Thomas Zimmermann 40b57d
---
Thomas Zimmermann 40b57d
 drivers/gpu/drm/drm_fb_helper.c |    3 ++-
Thomas Zimmermann 40b57d
 1 file changed, 2 insertions(+), 1 deletion(-)
Thomas Zimmermann 40b57d
Thomas Zimmermann 40b57d
--- a/drivers/gpu/drm/drm_fb_helper.c
Thomas Zimmermann 40b57d
+++ b/drivers/gpu/drm/drm_fb_helper.c
Thomas Zimmermann 40b57d
@@ -2104,6 +2104,7 @@ static int drm_fb_helper_generic_probe(s
Thomas Zimmermann 40b57d
 	fbi->fbops = &drm_fbdev_fb_ops;
Thomas Zimmermann 40b57d
 	fbi->screen_size = fb->height * fb->pitches[0];
Thomas Zimmermann 40b57d
 	fbi->fix.smem_len = fbi->screen_size;
Thomas Zimmermann 40b57d
+	fbi->flags = FBINFO_DEFAULT;
Thomas Zimmermann 40b57d
 
Thomas Zimmermann 40b57d
 	drm_fb_helper_fill_info(fbi, fb_helper, sizes);
Thomas Zimmermann 40b57d
 
Thomas Zimmermann 40b57d
@@ -2111,9 +2112,9 @@ static int drm_fb_helper_generic_probe(s
Thomas Zimmermann 40b57d
 		fbi->screen_buffer = vzalloc(fbi->screen_size);
Thomas Zimmermann 40b57d
 		if (!fbi->screen_buffer)
Thomas Zimmermann 40b57d
 			return -ENOMEM;
Thomas Zimmermann 40b57d
+		fbi->flags |= FBINFO_VIRTFB | FBINFO_READS_FAST;
Thomas Zimmermann 40b57d
 
Thomas Zimmermann 40b57d
 		fbi->fbdefio = &drm_fbdev_defio;
Thomas Zimmermann 40b57d
-
Thomas Zimmermann 40b57d
 		fb_deferred_io_init(fbi);
Thomas Zimmermann 40b57d
 	} else {
Thomas Zimmermann 40b57d
 		/* buffer is mapped for HW framebuffer */