Changeset 47388 in vbox for trunk/src/VBox/Additions/linux/drm/vboxvideo_device.c

Timestamp:

Jul 25, 2013 12:12:10 PM (12 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: next mode-setting code drop.

File:

• trunk/src/VBox/Additions/linux/drm/vboxvideo_device.c (modified) (4 diffs)

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

@@ -53 +53 @@
 #include <VBox/VBoxVideoGuest.h>
 
+static int vboxvideo_vram_init(struct vboxvideo_device *gdev)
+{
+    /* work out accessible VRAM */
+    gdev->mc.aper_base = pci_resource_start(gdev->ddev->pdev, 1);
+    gdev->mc.aper_size = pci_resource_len(gdev->ddev->pdev, 1);
+
+    gdev->mc.vram = ioremap(gdev->mc.aper_base, gdev->mc.aper_size);
+    if (!gdev->mc.vram) {
+        VBOXVIDEO_ERROR("Unable to ioremap %lu MB of VRAM. Bailing out.\n", (unsigned long)gdev->mc.aper_size / MB);
+        return -1;
+    }
+    gdev->fAnyX        = VBoxVideoAnyWidthAllowed();
+    gdev->mc.vram_size = VBoxVideoGetVRAMSize();
+
+    return 0;
+}
+
+static void vboxvideo_vram_fini(struct vboxvideo_device *gdev)
+{
+    iounmap(gdev->mc.vram);
+    gdev->mc.vram = NULL;
+}
+
 int vboxvideo_device_init(struct vboxvideo_device *gdev,
               struct drm_device *ddev,
@@ -58 +81 @@
               uint32_t flags)
 {
+    int ret;
+
     gdev->dev      = &pdev->dev;
     gdev->ddev     = ddev;
@@ -67 +92 @@
      *        stuff.
      */
-    gdev->fAnyX        = VBoxVideoAnyWidthAllowed();
-    gdev->mc.vram_size = VBoxVideoGetVRAMSize();
+    ret = vboxvideo_vram_init(gdev);
+    if (ret)
+        return ret;
 
     return 0;
@@ -75 +101 @@
 void vboxvideo_device_fini(struct vboxvideo_device *gdev)
 {
-
+    vboxvideo_vram_fini(gdev);
 }
 #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) */