Changeset 60085 in vbox for trunk/src/VBox

Timestamp:

Mar 17, 2016 7:06:05 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: fix disabling of virtual screens from the host in the kernel graphics driver.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.h (modified) (2 diffs)
• vbox_irq.c (modified) (2 diffs)
• vbox_mode.c (modified) (7 diffs)

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

@@ -136 +136 @@
     struct drm_connector base;
     char name[32];
-    unsigned crtc_id;
+    struct vbox_crtc *vbox_crtc;
     struct {
         uint16_t width;
@@ -147 +147 @@
     struct drm_crtc base;
     bool blanked;
+    bool disconnected;
     unsigned crtc_id;
     uint32_t fb_offset;

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

@@ -89 +89 @@
     struct vbox_connector *vbox_connector;
     struct VBVAMODEHINT *hints;
+    uint16_t flags;
+    bool disconnected;
+    unsigned crtc_id;
     int rc;
 
@@ -101 +104 @@
     list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
         vbox_connector = to_vbox_connector(connector);
-        hints = &vbox->last_mode_hints[vbox_connector->crtc_id];
+        hints = &vbox->last_mode_hints[vbox_connector->vbox_crtc->crtc_id];
         if (hints->magic == VBVAMODEHINT_MAGIC) {
             LogFunc(("vboxvideo: %d: crtc_id=%u, mode %hdx%hd(enabled:%d),%hdx%hd\n",
-                     __LINE__, (unsigned)vbox_connector->crtc_id,
+                     __LINE__, (unsigned)vbox_connector->vbox_crtc->crtc_id,
                      (short)hints->cx, (short)hints->cy, (int)hints->fEnabled,
                      (short)hints->dx, (short)hints->dy));
+            disconnected = !(hints->fEnabled);
+            crtc_id = vbox_connector->vbox_crtc->crtc_id;
+            flags =   VBVA_SCREEN_F_ACTIVE
+                    | (disconnected ? VBVA_SCREEN_F_DISABLED : VBVA_SCREEN_F_BLANK);
             vbox_connector->mode_hint.width = hints->cx & 0x8fff;
             vbox_connector->mode_hint.height = hints->cy & 0x8fff;
-            vbox_connector->mode_hint.disconnected = !(hints->fEnabled);
+            vbox_connector->mode_hint.disconnected = disconnected;
+            if (vbox_connector->vbox_crtc->disconnected != disconnected) {
+                VBoxHGSMIProcessDisplayInfo(&vbox->submit_info, crtc_id,
+                                            0, 0, 0, hints->cx * 4, hints->cx,
+                                            hints->cy, 0, flags);
+                vbox_connector->vbox_crtc->disconnected = disconnected;
+            }
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
             if ((hints->dx < 0xffff) && (hints->dy < 0xffff)) {

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

@@ -92 +92 @@
                                   crtc->x, crtc->y); */
     flags = VBVA_SCREEN_F_ACTIVE;
-    flags |= (crtc->enabled ? 0 : VBVA_SCREEN_F_DISABLED);
+    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,
                                 crtc->x, crtc->y,
@@ -312 +313 @@
 };
 
-static int vbox_crtc_init(struct drm_device *dev, unsigned i)
-{
-    struct vbox_crtc *crtc;
-
-    LogFunc(("vboxvideo: %d\n", __LINE__));
-    crtc = kzalloc(sizeof(struct vbox_crtc), GFP_KERNEL);
-    if (!crtc)
-        return -ENOMEM;
-    crtc->crtc_id = i;
-
-    drm_crtc_init(dev, &crtc->base, &vbox_crtc_funcs);
-    drm_mode_crtc_set_gamma_size(&crtc->base, 256);
-    drm_crtc_helper_add(&crtc->base, &vbox_crtc_helper_funcs);
-    LogFunc(("vboxvideo: %d: crtc=%p\n", __LINE__, crtc));
-
-    return 0;
+static struct vbox_crtc *vbox_crtc_init(struct drm_device *dev, unsigned i)
+{
+    struct vbox_crtc *vbox_crtc;
+
+    LogFunc(("vboxvideo: %d\n", __LINE__));
+    vbox_crtc = kzalloc(sizeof(struct vbox_crtc), GFP_KERNEL);
+    if (!vbox_crtc)
+        return NULL;
+    vbox_crtc->crtc_id = i;
+
+    drm_crtc_init(dev, &vbox_crtc->base, &vbox_crtc_funcs);
+    drm_mode_crtc_set_gamma_size(&vbox_crtc->base, 256);
+    drm_crtc_helper_add(&vbox_crtc->base, &vbox_crtc_helper_funcs);
+    LogFunc(("vboxvideo: %d: crtc=%p\n", __LINE__, vbox_crtc));
+
+    return vbox_crtc;
 }
 
@@ -474 +475 @@
     LogFunc(("vboxvideo: %d: connector=%p\n", __LINE__, connector));
     vbox_connector = to_vbox_connector(connector);
-    return !vbox_connector->mode_hint.disconnected;
+    return vbox_connector->mode_hint.disconnected ?
+                connector_status_disconnected : connector_status_connected;
 }
 
@@ -508 +510 @@
 };
 
-static int vbox_connector_init(struct drm_device *dev, unsigned cScreen,
+static int vbox_connector_init(struct drm_device *dev,
+                               struct vbox_crtc *vbox_crtc,
                                struct drm_encoder *encoder)
 {
@@ -521 +524 @@
 
     connector = &vbox_connector->base;
-    vbox_connector->crtc_id = cScreen;
+    vbox_connector->vbox_crtc = vbox_crtc;
 
     drm_connector_init(dev, connector, &vbox_connector_funcs,
@@ -553 +556 @@
     struct vbox_private *vbox = dev->dev_private;
     struct drm_encoder *encoder;
+    struct vbox_crtc *vbox_crtc;
     unsigned i;
     /* vbox_cursor_init(dev); */
@@ -558 +562 @@
     for (i = 0; i < vbox->num_crtcs; ++i)
     {
-        vbox_crtc_init(dev, i);
+        vbox_crtc = vbox_crtc_init(dev, i);
+        if (!vbox_crtc)
+            return -ENOMEM;
         encoder = vbox_encoder_init(dev, i);
-        if (encoder)
-            vbox_connector_init(dev, i, encoder);
+        if (!encoder)
+            return -ENOMEM;
+        vbox_connector_init(dev, vbox_crtc, encoder);
     }
     return 0;