儲存庫 vbox 的更動 62568

時間撮記:

2016-7-26 下午03:30:28 (8 年 以前)

作者:

vboxsync

訊息:

bugref:8087: Additions/x11: support non-root X server: fix regression from not mapping all of the guest VRAM in the kernel driver: we were no longer reporting the host flags location correctly, preventing IRQ handling and dynamic resizing from working with large VRAM sizes.

位置:

trunk/src/VBox/Additions/linux/drm

檔案:

• vbox_drv.h (修改) (1 筆差異)
• vbox_main.c (修改) (4 筆差異)
• vbox_mode.c (修改) (1 筆差異)

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

@@ -105 +105 @@
     /** Amount of available VRAM, not including space used for buffers. */
     uint32_t available_vram_size;
-    /** Offset of host communication area in mapped VRAM. */
-    uint32_t vram_host_offset;
+    /** Offset of mapped VRAM area in full VRAM. */
+    uint32_t vram_map_start;
     /** Offset to the host flags in the VRAM. */
     uint32_t host_flags_offset;

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

@@ -70 +70 @@
     unsigned i;
     struct VBVABUFFER *vbva;
+    uint32_t vram_map_offset = vbox->available_vram_size - vbox->vram_map_start;
 
     AssertLogRelReturnVoid(vbox->vbva_info != NULL);
@@ -76 +77 @@
             LogFunc(("vboxvideo: enabling VBVA.\n"));
             vbva = (struct VBVABUFFER *) (  ((uint8_t *)vbox->mapped_vram)
-                                           + vbox->vram_host_offset
+                                           + vram_map_offset
                                            + i * VBVA_MIN_BUFFER_SIZE);
             if (!VBoxVBVAEnable(&vbox->vbva_info[i], &vbox->submit_info, vbva, i))
@@ -255 +256 @@
     }
     /* Take a command buffer for each screen from the end of usable VRAM. */
-    vbox->vram_host_offset = (VBOX_MAX_SCREENS - vbox->num_crtcs) * VBVA_MIN_BUFFER_SIZE;
     vbox->available_vram_size -= vbox->num_crtcs * VBVA_MIN_BUFFER_SIZE;
     for (i = 0; i < vbox->num_crtcs; ++i)
@@ -325 +325 @@
     if (!vbox->mapped_vram)
         return -ENOMEM;
+    vbox->vram_map_start = map_start;
     guest_heap = ((uint8_t *)vbox->mapped_vram) + base_offset - map_start
                    + guest_heap_offset;

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

@@ -107 +107 @@
                                 pitch, width, height,
                                 vbox_crtc->blanked ? 0 : bpp, flags);
-    VBoxHGSMIReportFlagsLocation(&vbox->submit_info, vbox->host_flags_offset);
+    VBoxHGSMIReportFlagsLocation(&vbox->submit_info,   vbox->vram_map_start
+                                                     + vbox->host_flags_offset);
     LogFunc(("vboxvideo: %d\n", __LINE__));
 }