Changeset 69748 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Nov 18, 2017 8:56:56 PM (7 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: set up fbdev fix information correctly.
bugref:4567: Linux kernel driver maintenance

For historical reasons we were setting up the fbdev fix information
completely wrongly, and too late to boot. I discovered this when we started
having occasional oopses at boot, and hope that I fixed both problems in this
change.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.h (modified) (1 diff)
• vbox_fb.c (modified) (2 diffs)
• vbox_mode.c (modified) (1 diff)

trunk/src/VBox/Additions/linux/drm/vbox_drv.h

@@ -253 +253 @@
 void vbox_fbdev_fini(struct drm_device *dev);
 void vbox_fbdev_set_suspend(struct drm_device *dev, int state);
-void vbox_fbdev_set_base(struct vbox_private *vbox, unsigned long gpu_addr);
 
 struct vbox_bo {

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

@@ -315 +315 @@
         info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0);
         info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);
+        info->fix.smem_start = 0;
+        info->fix.smem_len = size;
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
@@ -452 +454 @@
         fb_set_suspend(vbox->fbdev->helper.fbdev, state);
 }
-
-void vbox_fbdev_set_base(struct vbox_private *vbox, unsigned long gpu_addr)
-{
-        vbox->fbdev->helper.fbdev->fix.smem_start =
-            vbox->fbdev->helper.fbdev->apertures->ranges[0].base + gpu_addr;
-        vbox->fbdev->helper.fbdev->fix.smem_len =
-            vbox->available_vram_size - gpu_addr;
-}

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

@@ -275 +275 @@
 
         ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, &gpu_addr);
-        if (ret) {
-                vbox_bo_unreserve(bo);
+        vbox_bo_unreserve(bo);
+        if (ret)
                 return ret;
-        }
-
-        if (&vbox->fbdev->afb == vbox_fb)
-                vbox_fbdev_set_base(vbox, gpu_addr);
-        vbox_bo_unreserve(bo);
-
-        /* vbox_set_start_address_crt1(crtc, (u32)gpu_addr); */
+
         vbox_crtc->fb_offset = gpu_addr;
         if (vbox_set_up_input_mapping(vbox)) {