drm/fb-helper: Mark screen buffers in system memory with FBINFO_VIRTFB

From Thomas Zimmermann
51f0af904fb621721d2c95c1eb349fb46af63a04 in linux 5.15.y/5.15.33
cd9f7f7ac5932129fe81b4c7559cfcb226ec7c5c in mainline linux

diff --git a/sys/dev/pci/drm/drm_fb_helper.c b/sys/dev/pci/drm/drm_fb_helper.c
index f7aa0ef..d56b9c6 100644 (file)
--- a/sys/dev/pci/drm/drm_fb_helper.c
+++ b/sys/dev/pci/drm/drm_fb_helper.c
@@ -2409,6 +2409,7 @@ static int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper,
        fbi->fbops = &drm_fbdev_fb_ops;
        fbi->screen_size = fb->height * fb->pitches[0];
        fbi->fix.smem_len = fbi->screen_size;
+       fbi->flags = FBINFO_DEFAULT;
 
        drm_fb_helper_fill_info(fbi, fb_helper, sizes);
 
@@ -2416,19 +2417,21 @@ static int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper,
                fbi->screen_buffer = vzalloc(fbi->screen_size);
                if (!fbi->screen_buffer)
                        return -ENOMEM;
+               fbi->flags |= FBINFO_VIRTFB | FBINFO_READS_FAST;
 
                fbi->fbdefio = &drm_fbdev_defio;
-
                fb_deferred_io_init(fbi);
        } else {
                /* buffer is mapped for HW framebuffer */
                ret = drm_client_buffer_vmap(fb_helper->buffer, &map);
                if (ret)
                        return ret;
-               if (map.is_iomem)
+               if (map.is_iomem) {
                        fbi->screen_base = map.vaddr_iomem;
-               else
+               } else {
                        fbi->screen_buffer = map.vaddr;
+                       fbi->flags |= FBINFO_VIRTFB;
+               }
 
                /*
                 * Shamelessly leak the physical address to user-space. As