Changeset 61596 in vbox for trunk/src/VBox/Additions/linux/drm

Timestamp:

Jun 9, 2016 6:11:14 AM (9 years ago)

Author:

vboxsync

Message:

bugref:4567: Linux kernel driver maintenance:
drm/vboxvideo: Initialize data needed to map fbdev memory

Due to a missing initialization there was no way to map fbdev memory.
Thus for example using the Xserver with the fbdev driver failed.
This fix adds initialization for fix.smem_start and fix.smem_len
in the fb_info structure, which fixes this problem.

Signed-off-by: Egbert Eich <eich@…>
Signed-off-by: Egbert Eich <eich@…>

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -228 +228 @@
 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

@@ -452 +452 @@
     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->vram_size - gpu_addr;
+}

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

@@ -225 +225 @@
         if (ret)
             DRM_ERROR("failed to kmap fbcon\n");
+        else
+            vbox_fbdev_set_base(vbox, gpu_addr);
     }
     vbox_bo_unreserve(bo);