Changeset 74864 in vbox for trunk

Timestamp:

Oct 16, 2018 11:48:44 AM (6 years ago)

Author:

vboxsync

Message:

Additions/linux/vboxvideo: Use fbdev helpers where possible
bugref:8282: Additions/linux: track kernel changes to vboxvideo in our own tree

This results in a nice cleanup, and fixes link errors when fbdev support
is disabled.

Signed-off-by: Hans de Goede <hdegoede@…>
Signed-off-by: Greg Kroah-Hartman <gregkh@…>

Adjusted by the VirtualBox team to make it build on older kernels too.

File:

• trunk/src/VBox/Additions/linux/drm/vbox_fb.c (modified) (12 diffs)

trunk/src/VBox/Additions/linux/drm/vbox_fb.c

@@ -51 +51 @@
 #include <VBoxVideo.h>
 
-#define VBOX_DIRTY_DELAY (HZ / 30)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) && !defined(RHEL_74)
 /**
  * Tell the host about dirty rectangles to update.
@@ -124 +124 @@
         vbox_bo_unreserve(bo);
 }
+#endif
 
 #ifdef CONFIG_FB_DEFERRED_IO
-static void vbox_deferred_io(struct fb_info *info, struct list_head *pagelist)
+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) && !defined(RHEL_74)
+static void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagelist)
 {
         struct vbox_fbdev *fbdev = info->par;
@@ -150 +152 @@
         }
 }
+# endif
 
 static struct fb_deferred_io vbox_defio = {
-        .delay = VBOX_DIRTY_DELAY,
-        .deferred_io = vbox_deferred_io,
+        .delay = HZ / 30,
+        .deferred_io = drm_fb_helper_deferred_io,
 };
 #endif
 
-static void vbox_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) && !defined(RHEL_73)
+static void drm_fb_helper_sys_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 {
         struct vbox_fbdev *fbdev = info->par;
@@ -165 +169 @@
 }
 
-static void vbox_copyarea(struct fb_info *info, const struct fb_copyarea *area)
+static void drm_fb_helper_sys_copyarea(struct fb_info *info, const struct fb_copyarea *area)
 {
         struct vbox_fbdev *fbdev = info->par;
@@ -173 +177 @@
 }
 
-static void vbox_imageblit(struct fb_info *info, const struct fb_image *image)
+static void drm_fb_helper_sys_imageblit(struct fb_info *info, const struct fb_image *image)
 {
         struct vbox_fbdev *fbdev = info->par;
@@ -181 +185 @@
                           image->height);
 }
+#endif
 
 static struct fb_ops vboxfb_ops = {
@@ -186 +191 @@
         .fb_check_var = drm_fb_helper_check_var,
         .fb_set_par = drm_fb_helper_set_par,
-        .fb_fillrect = vbox_fillrect,
-        .fb_copyarea = vbox_copyarea,
-        .fb_imageblit = vbox_imageblit,
+        .fb_fillrect = drm_fb_helper_sys_fillrect,
+        .fb_copyarea = drm_fb_helper_sys_copyarea,
+        .fb_imageblit = drm_fb_helper_sys_imageblit,
         .fb_pan_display = drm_fb_helper_pan_display,
         .fb_blank = drm_fb_helper_blank,
@@ -221 +226 @@
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) && !defined(RHEL_73)
+static struct fb_info *drm_fb_helper_alloc_fbi(struct drm_fb_helper *helper)
+{
+        struct fb_info *info;
+        struct vbox_fbdev *fbdev =
+            container_of(helper, struct vbox_fbdev, helper);
+        struct drm_device *dev = fbdev->helper.dev;
+        struct device *device = &dev->pdev->dev;
+
+        info = framebuffer_alloc(0, device);
+        if (!info)
+                return ERR_PTR(-ENOMEM);
+        fbdev->helper.fbdev = info;
+
+        if (fb_alloc_cmap(&info->cmap, 256, 0))
+                return ERR_PTR(-ENOMEM);
+
+        info->apertures = alloc_apertures(1);
+        if (!info->apertures)
+                return ERR_PTR(-ENOMEM);
+
+        return info;
+}
+#endif
+
 static int vboxfb_create(struct drm_fb_helper *helper,
                          struct drm_fb_helper_surface_size *sizes)
@@ -230 +260 @@
         struct drm_framebuffer *fb;
         struct fb_info *info;
-        struct device *device = &dev->pdev->dev;
         struct drm_gem_object *gobj;
         struct vbox_bo *bo;
@@ -280 +309 @@
         }
 
-        info = framebuffer_alloc(0, device);
-        if (!info)
-                return -ENOMEM;
+        info = drm_fb_helper_alloc_fbi(helper);
+        if (IS_ERR(info))
+                return -PTR_ERR(info);
+
         info->par = fbdev;
 
@@ -289 +319 @@
         fb = &fbdev->afb.base;
         fbdev->helper.fb = fb;
-        fbdev->helper.fbdev = info;
 
         strcpy(info->fix.id, "vboxdrmfb");
@@ -301 +330 @@
         info->fbops = &vboxfb_ops;
 
-        ret = fb_alloc_cmap(&info->cmap, 256, 0);
-        if (ret)
-                return -ENOMEM;
-
         /*
          * This seems to be done for safety checking that the framebuffer
          * is not registered twice by different drivers.
          */
-        info->apertures = alloc_apertures(1);
-        if (!info->apertures)
-                return -ENOMEM;
         info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0);
         info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);