Changeset 74779 in vbox for trunk

Timestamp:

Oct 12, 2018 8:05:16 AM (6 years ago)

Author:

vboxsync

Message:

Additions/linux/vboxvideo: only set the views once, at initialisation time.
bugref: 9253: Enabling 2nd virtual screen results in an assert.
Views in vboxvideo/HGSMI are a concept used to tell the graphics card about
the virtual frame-buffer in use for each virtual screen. Up until now we have
set these prior to each mode-set operation. The assertion reported in this
bug was due to a mismatch when enabling and disabling screens using a mode-set
for DPMS.
In fact though, there is no good reason for the graphics hardware to need to
know about the frame-buffers at all. It is enough for it to know the offset
in the video memory where scan-out starts, along with size and stride. So
this change switches to just setting the views once, at driver initialisation
time, and setting them to cover the whole range of potentially usable video
memory for each screen at that point. Thus whatever framebuffer is created
for a mode-set will always be a subset of the view.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_main.c (modified) (3 diffs)
• vbox_mode.c (modified) (4 diffs)

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

@@ -40 +40 @@
 #include <VBoxVideoVBE.h>
 
+#include "hgsmi_channels.h"
+
 static void vbox_user_framebuffer_destroy(struct drm_framebuffer *fb)
 {
@@ -232 +234 @@
 #endif
 
+/**
+ * Tell the host about the views.  This design originally targeted the
+ * Windows XP driver architecture and assumed that each screen would
+ * have a dedicated frame buffer with the command buffer following it,
+ * the whole being a "view".  The host works out which screen a command
+ * buffer belongs to by checking whether it is in the first view, then
+ * whether it is in the second and so on.  The first match wins.  We
+ * cheat around this by making the first view be the managed memory
+ * plus the first command buffer, the second the same plus the second
+ * buffer and so on.
+ */
+static int vbox_set_views(struct vbox_private *vbox)
+{
+        VBVAINFOVIEW *p;
+        int i;
+
+        p = VBoxHGSMIBufferAlloc(vbox->guest_pool, sizeof(*p),
+                               HGSMI_CH_VBVA, VBVA_INFO_VIEW);
+        if (!p)
+                return -ENOMEM;
+
+        for (i = 0; i < vbox->num_crtcs; ++i) {
+                p->u32ViewIndex = i;
+                p->u32ViewOffset = 0;
+                p->u32ViewSize = vbox->available_vram_size +
+                        i * VBVA_MIN_BUFFER_SIZE;
+                p->u32MaxScreenSize = vbox->available_vram_size;
+
+                VBoxHGSMIBufferSubmit(vbox->guest_pool, p);
+        }
+
+        VBoxHGSMIBufferFree(vbox->guest_pool, p);
+
+        return 0;
+}
+
 static int vbox_accel_init(struct vbox_private *vbox)
 {
-        unsigned int i;
+        unsigned int i, ret;
 
         vbox->vbva_info = devm_kcalloc(vbox->dev->dev, vbox->num_crtcs,
@@ -258 +296 @@
 
         vbox_enable_accel(vbox);
-
-        return 0;
+        ret = vbox_set_views(vbox);
+        if (ret)
+                goto err_pci_iounmap;
+
+        return 0;
+
+err_pci_iounmap:
+        pci_iounmap(vbox->dev->pdev, vbox->vbva_buffers);
+        return ret;
 }
 

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

@@ -45 +45 @@
 
 #include "VBoxVideo.h"
-#include "hgsmi_channels.h"
 
 static int vbox_cursor_set2(struct drm_crtc *crtc, struct drm_file *file_priv,
@@ -108 +107 @@
         flags |= vbox_crtc->disconnected ? VBVA_SCREEN_F_DISABLED : 0;
         VBoxHGSMIProcessDisplayInfo(vbox->guest_pool, vbox_crtc->crtc_id,
-                                   x_offset, y_offset,
+                                   x_offset, y_offset, vbox_crtc->fb_offset +
                                    crtc->x * bpp / 8 + crtc->y * pitch,
                                    pitch, width, height,
                                    vbox_crtc->blanked ? 0 : bpp, flags);
-}
-
-static int vbox_set_view(struct drm_crtc *crtc)
-{
-        struct vbox_crtc *vbox_crtc = to_vbox_crtc(crtc);
-        struct vbox_private *vbox = crtc->dev->dev_private;
-        VBVAINFOVIEW *p;
-
-        /*
-         * Tell the host about the view.  This design originally targeted the
-         * Windows XP driver architecture and assumed that each screen would
-         * have a dedicated frame buffer with the command buffer following it,
-         * the whole being a "view".  The host works out which screen a command
-         * buffer belongs to by checking whether it is in the first view, then
-         * whether it is in the second and so on.  The first match wins.  We
-         * cheat around this by making 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->guest_pool, sizeof(*p),
-                               HGSMI_CH_VBVA, VBVA_INFO_VIEW);
-        if (!p)
-                return -ENOMEM;
-
-        p->u32ViewIndex = vbox_crtc->crtc_id;
-        p->u32ViewOffset = vbox_crtc->fb_offset;
-        p->u32ViewSize = vbox->available_vram_size - vbox_crtc->fb_offset +
-                       vbox_crtc->crtc_id * VBVA_MIN_BUFFER_SIZE;
-        p->u32MaxScreenSize = vbox->available_vram_size - vbox_crtc->fb_offset;
-
-        VBoxHGSMIBufferSubmit(vbox->guest_pool, p);
-        VBoxHGSMIBufferFree(vbox->guest_pool, p);
-
-        return 0;
 }
 
@@ -287 +252 @@
                 list_for_each_entry(crtci, &vbox->dev->mode_config.crtc_list,
                                     head) {
-                        vbox_set_view(crtc);
                         vbox_do_modeset(crtci, &crtci->mode);
                 }
@@ -305 +269 @@
                 return ret;
         mutex_lock(&vbox->hw_mutex);
-        ret = vbox_set_view(crtc);
         if (!ret)
                 vbox_do_modeset(crtc, mode);