Changeset 67175 in vbox for trunk/src/VBox/Additions

Timestamp:

May 31, 2017 2:38:02 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
[PATCH 2/3] additions/linux/drm: Remove unnecessary wrapping of guest_pool in a struct
Signed-off-by: Hans de Goede <hdegoede@…>

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• HGSMIBase.h (modified) (2 diffs)
• vbox_drv.h (modified) (1 diff)
• vbox_irq.c (modified) (2 diffs)
• vbox_main.c (modified) (8 diffs)
• vbox_mode.c (modified) (11 diffs)

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

@@ -34 +34 @@
 #include <linux/genalloc.h>
 
-typedef struct HGSMIGUESTCOMMANDCONTEXT {
-        struct gen_pool *guest_pool;
-} HGSMIGUESTCOMMANDCONTEXT, *PHGSMIGUESTCOMMANDCONTEXT;
+typedef struct gen_pool *PHGSMIGUESTCOMMANDCONTEXT;
 
 void *hgsmi_buffer_alloc(struct gen_pool *guest_pool, size_t size,
@@ -48 +46 @@
  */
 #define VBoxHGSMIBufferAlloc(ctx, size, ch, ch_info) \
-        hgsmi_buffer_alloc((ctx)->guest_pool, size, ch, ch_info)
-#define VBoxHGSMIBufferFree(ctx, buf)   hgsmi_buffer_free((ctx)->guest_pool, buf)
-#define VBoxHGSMIBufferSubmit(ctx, buf) hgsmi_buffer_submit((ctx)->guest_pool, buf)
+        hgsmi_buffer_alloc(ctx, size, ch, ch_info)
+#define VBoxHGSMIBufferFree(ctx, buf)   hgsmi_buffer_free(ctx, buf)
+#define VBoxHGSMIBufferSubmit(ctx, buf) hgsmi_buffer_submit(ctx, buf)
 
 #endif

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

@@ -90 +90 @@
     u8 __iomem *guest_heap;
     u8 __iomem *vbva_buffers;
-    HGSMIGUESTCOMMANDCONTEXT submit_info;
+    struct gen_pool *guest_pool;
     struct VBVABUFFERCONTEXT *vbva_info;
     bool any_pitch;

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

@@ -124 +124 @@
     int rc;
 
-    rc = VBoxHGSMIGetModeHints(&vbox->submit_info, vbox->num_crtcs,
+    rc = VBoxHGSMIGetModeHints(vbox->guest_pool, vbox->num_crtcs,
                                vbox->last_mode_hints);
     if (RT_FAILURE(rc)) {
@@ -150 +150 @@
             vbox_connector->mode_hint.disconnected = disconnected;
             if (vbox_connector->vbox_crtc->disconnected != disconnected) {
-                VBoxHGSMIProcessDisplayInfo(&vbox->submit_info, crtc_id,
+                VBoxHGSMIProcessDisplayInfo(vbox->guest_pool, crtc_id,
                                             0, 0, 0, hints->cx * 4, hints->cx,
                                             hints->cy, 0, flags);

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

@@ -64 +64 @@
             vbva = (struct VBVABUFFER *) ((u8 *)vbox->vbva_buffers
                                            + i * VBVA_MIN_BUFFER_SIZE);
-            if (!VBoxVBVAEnable(&vbox->vbva_info[i], &vbox->submit_info, vbva, i)) {
+            if (!VBoxVBVAEnable(&vbox->vbva_info[i], vbox->guest_pool, vbva, i)) {
                 /* very old host or driver error. */
                 printk(KERN_ERR "vboxvideo: VBoxVBVAEnable failed - heap allocation error.\n");
@@ -78 +78 @@
 
     for (i = 0; i < vbox->num_crtcs; ++i)
-        VBoxVBVADisable(&vbox->vbva_info[i], &vbox->submit_info, i);
+        VBoxVBVADisable(&vbox->vbva_info[i], vbox->guest_pool, i);
 }
 
@@ -88 +88 @@
     if (vbox->initial_mode_queried)
         caps |= VBVACAPS_VIDEO_MODE_HINTS;
-    VBoxHGSMISendCapsInfo(&vbox->submit_info, caps);
+    VBoxHGSMISendCapsInfo(vbox->guest_pool, caps);
 }
 
@@ -124 +124 @@
                 cmd_hdr.h = (uint16_t)rects[i].y2 - rects[i].y1;
                 if (VBoxVBVABufferBeginUpdate(&vbox->vbva_info[crtc_id],
-                                              &vbox->submit_info))
+                                              vbox->guest_pool))
                 {
-                    VBoxVBVAWrite(&vbox->vbva_info[crtc_id], &vbox->submit_info, &cmd_hdr,
+                    VBoxVBVAWrite(&vbox->vbva_info[crtc_id], vbox->guest_pool, &cmd_hdr,
                                   sizeof(cmd_hdr));
                     VBoxVBVABufferEndUpdate(&vbox->vbva_info[crtc_id]);
@@ -264 +264 @@
     uint32_t have_hints, have_cursor;
 
-    return    RT_SUCCESS(VBoxQueryConfHGSMI(&vbox->submit_info, VBOX_VBVA_CONF32_MODE_HINT_REPORTING, &have_hints))
-           && RT_SUCCESS(VBoxQueryConfHGSMI(&vbox->submit_info, VBOX_VBVA_CONF32_GUEST_CURSOR_REPORTING, &have_cursor))
+    return    RT_SUCCESS(VBoxQueryConfHGSMI(vbox->guest_pool, VBOX_VBVA_CONF32_MODE_HINT_REPORTING, &have_hints))
+           && RT_SUCCESS(VBoxQueryConfHGSMI(vbox->guest_pool, VBOX_VBVA_CONF32_GUEST_CURSOR_REPORTING, &have_cursor))
            && have_hints == VINF_SUCCESS
            && have_cursor == VINF_SUCCESS;
@@ -287 +287 @@
 
     /* Create guest-heap mem-pool use 2^4 = 16 byte chunks */
-    vbox->submit_info.guest_pool = gen_pool_create(4, -1);
-    if (!vbox->submit_info.guest_pool)
+    vbox->guest_pool = gen_pool_create(4, -1);
+    if (!vbox->guest_pool)
         return -ENOMEM;
 
-    ret = gen_pool_add_virt(vbox->submit_info.guest_pool,
+    ret = gen_pool_add_virt(vbox->guest_pool,
                             (unsigned long)vbox->guest_heap,
                             GUEST_HEAP_OFFSET(vbox),
@@ -301 +301 @@
     vbox->available_vram_size = GUEST_HEAP_OFFSET(vbox);
     /* Linux drm represents monitors as a 32-bit array. */
-    vbox->num_crtcs = min(VBoxHGSMIGetMonitorCount(&vbox->submit_info),
+    vbox->num_crtcs = min(VBoxHGSMIGetMonitorCount(vbox->guest_pool),
                           (uint32_t)VBOX_MAX_SCREENS);
     if (!have_hgsmi_mode_hints(vbox))
@@ -385 +385 @@
     vbox_hw_fini(vbox);
     vbox_mm_fini(vbox);
-    if (vbox->submit_info.guest_pool)
-        gen_pool_destroy(vbox->submit_info.guest_pool);
+    if (vbox->guest_pool)
+        gen_pool_destroy(vbox->guest_pool);
     if (vbox->guest_heap)
         pci_iounmap(dev->pdev, vbox->guest_heap);

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

@@ -101 +101 @@
     flags |= (crtc->enabled && !vbox_crtc->blanked ? 0 : VBVA_SCREEN_F_BLANK);
     flags |= (vbox_crtc->disconnected ? VBVA_SCREEN_F_DISABLED : 0);
-    VBoxHGSMIProcessDisplayInfo(&vbox->submit_info, vbox_crtc->crtc_id,
+    VBoxHGSMIProcessDisplayInfo(vbox->guest_pool, vbox_crtc->crtc_id,
                                 x_offset, y_offset,
                                 crtc->x * bpp / 8 + crtc->y * pitch,
@@ -122 +122 @@
      * the first view be the managed memory plus the first command buffer, the
      * second the same plus the second buffer and so on. */
-    p = VBoxHGSMIBufferAlloc(&vbox->submit_info, sizeof(VBVAINFOVIEW), HGSMI_CH_VBVA,
+    p = VBoxHGSMIBufferAlloc(vbox->guest_pool, sizeof(VBVAINFOVIEW), HGSMI_CH_VBVA,
                              VBVA_INFO_VIEW);
     if (p)
@@ -132 +132 @@
                              + vbox_crtc->crtc_id * VBVA_MIN_BUFFER_SIZE;
         pInfo->u32MaxScreenSize = vbox->available_vram_size - vbox_crtc->fb_offset;
-        VBoxHGSMIBufferSubmit(&vbox->submit_info, p);
-        VBoxHGSMIBufferFree(&vbox->submit_info, p);
+        VBoxHGSMIBufferSubmit(vbox->guest_pool, p);
+        VBoxHGSMIBufferFree(vbox->guest_pool, p);
     }
     else
@@ -297 +297 @@
     if (!rc)
         vbox_do_modeset(crtc, mode);
-    VBoxHGSMIUpdateInputMapping(&vbox->submit_info, 0, 0,
+    VBoxHGSMIUpdateInputMapping(vbox->guest_pool, 0, 0,
                                 vbox->input_mapping_width,
                                 vbox->input_mapping_height);
@@ -536 +536 @@
      * We need to report the flags location before reporting the IRQ
      * capability. */
-    VBoxHGSMIReportFlagsLocation(&vbox->submit_info, GUEST_HEAP_OFFSET(vbox) +
+    VBoxHGSMIReportFlagsLocation(vbox->guest_pool, GUEST_HEAP_OFFSET(vbox) +
                                                      HOST_FLAGS_OFFSET);
     if (vbox_connector->vbox_crtc->crtc_id == 0)
@@ -729 +729 @@
     /* Re-set this regularly as in 5.0.20 and earlier the information was lost
      * on save and restore. */
-    VBoxHGSMIUpdateInputMapping(&vbox->submit_info, 0, 0,
+    VBoxHGSMIUpdateInputMapping(vbox->guest_pool, 0, 0,
                                 vbox->input_mapping_width,
                                 vbox->input_mapping_height);
@@ -742 +742 @@
                 cursor_enabled = true;
         if (!cursor_enabled)
-            VBoxHGSMIUpdatePointerShape(&vbox->submit_info, 0, 0, 0, 0, 0, NULL, 0);
+            VBoxHGSMIUpdatePointerShape(vbox->guest_pool, 0, 0, 0, 0, 0, NULL, 0);
         return 0;
     }
@@ -749 +749 @@
         || width == 0 || height == 0)
         return -EINVAL;
-    rc = VBoxQueryConfHGSMI(&vbox->submit_info,
+    rc = VBoxQueryConfHGSMI(vbox->guest_pool,
                             VBOX_VBVA_CONF32_CURSOR_CAPABILITIES, &caps);
     ret = rc == VINF_SUCCESS ? 0 : rc == VERR_NO_MEMORY ? -ENOMEM : -EINVAL;
@@ -790 +790 @@
                                       | VBOX_MOUSE_POINTER_ALPHA;
                     copy_cursor_image(src, dst, width, height, mask_size);
-                    rc = VBoxHGSMIUpdatePointerShape(&vbox->submit_info, flags,
+                    rc = VBoxHGSMIUpdatePointerShape(vbox->guest_pool, flags,
                                                      vbox->cursor_hot_x,
                                                      vbox->cursor_hot_y,
@@ -835 +835 @@
     if (x + crtc_x < 0 || y + crtc_y < 0 || vbox->cursor_data_size == 0)
         return 0;
-    rc = VBoxHGSMICursorPosition(&vbox->submit_info, true, x + crtc_x,
+    rc = VBoxHGSMICursorPosition(vbox->guest_pool, true, x + crtc_x,
                                  y + crtc_y, &host_x, &host_y);
     /* Work around a bug after save and restore in 5.0.20 and earlier. */
@@ -850 +850 @@
     vbox->cursor_hot_x = hot_x;
     vbox->cursor_hot_y = hot_y;
-    rc = VBoxHGSMIUpdatePointerShape(&vbox->submit_info, flags, hot_x, hot_y,
+    rc = VBoxHGSMIUpdatePointerShape(vbox->guest_pool, flags, hot_x, hot_y,
                                      vbox->cursor_width, vbox->cursor_height,
                                      vbox->cursor_data,