UBUNTU: ubuntu: vbox -- update to 5.2.2-dfsg-2

[mirror_ubuntu-bionic-kernel.git] / ubuntu / vbox / vboxvideo / vbox_fb.c

diff --git a/ubuntu/vbox/vboxvideo/vbox_fb.c b/ubuntu/vbox/vboxvideo/vbox_fb.c
index 5c3c0411385d679b95f576a04db24195f5980607..9bc322978cf4c010e500276a750335307c32812f 100644 (file)
--- a/ubuntu/vbox/vboxvideo/vbox_fb.c
+++ b/ubuntu/vbox/vboxvideo/vbox_fb.c
@@ -309,6 +309,8 @@ static int vboxfb_create(struct drm_fb_helper *helper,
                return -ENOMEM;
        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)
        drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
@@ -446,11 +448,3 @@ void vbox_fbdev_set_suspend(struct drm_device *dev, int state)
 
        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;
-}