Changeset 63771 in vbox for trunk

Timestamp:

Sep 8, 2016 6:46:39 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8584: HGSMISetHostGuestFlags() assertion: make the Linux vboxvideo driver report the host flags location to the host before enabling interrupts, as the host sets flags when sending interrupts.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.h (modified) (1 diff)
• vbox_main.c (modified) (1 diff)
• vbox_mode.c (modified) (2 diffs)

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

@@ -215 +215 @@
 void vbox_enable_accel(struct vbox_private *vbox);
 void vbox_disable_accel(struct vbox_private *vbox);
-void vbox_enable_caps(struct vbox_private *vbox);
+void vbox_report_caps(struct vbox_private *vbox);
 
 void vbox_framebuffer_dirty_rectangles(struct drm_framebuffer *fb,

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

@@ -93 +93 @@
 }
 
-void vbox_enable_caps(struct vbox_private *vbox)
-{
-    uint32_t caps =   VBVACAPS_DISABLE_CURSOR_INTEGRATION
+void vbox_report_caps(struct vbox_private *vbox)
+{
+    uint32_t caps =    VBVACAPS_DISABLE_CURSOR_INTEGRATION
                      | VBVACAPS_IRQ
                      | VBVACAPS_USE_VBVA_ONLY;

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->vram_map_start
-                                                     + vbox->host_flags_offset);
     LogFunc(("vboxvideo: %d\n", __LINE__));
 }
@@ -507 +505 @@
     vbox_connector = to_vbox_connector(connector);
     vbox = connector->dev->dev_private;
+    /* Heuristic: we do not want to tell the host that we support dynamic
+     * resizing unless we feel confident that the user space client using
+     * the video driver can handle hot-plug events.  So the first time modes
+     * are queried after a "master" switch we tell the host that we do not,
+     * and immediately after we send the client a hot-plug notification as
+     * a test to see if they will respond and query again.
+     * That is also the reason why capabilities are reported to the host at
+     * this place in the code rather than elsewhere.
+     * We need to report the flags location before reporting the IRQ
+     * capability. */
+    VBoxHGSMIReportFlagsLocation(&vbox->submit_info,   vbox->vram_map_start
+                                                     + vbox->host_flags_offset);
     if (vbox_connector->vbox_crtc->crtc_id == 0)
-        vbox_enable_caps(vbox);
+        vbox_report_caps(vbox);
     if (!vbox->initial_mode_queried) {
         if (vbox_connector->vbox_crtc->crtc_id == 0) {