Changeset 59634 in vbox for trunk

Timestamp:

Feb 10, 2016 7:54:34 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: add support for passing virtual screen relative position information via connector properties. Not very useful at present, as the X.Org modesetting driver does not pick up changes.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -46 +46 @@
 #include "vbox_drv.h"
 
+#include <VBox/VBoxVideo.h>
+
 #include <drm/drm_crtc_helper.h>
 
@@ -78 +80 @@
 }
 
+/**
+ * Query the host for 
+ */
+static void vbox_update_mode_hints(struct vbox_private *vbox)
+{
+    struct drm_device *dev = vbox->dev;
+    struct drm_connector *connector;
+    struct vbox_connector *vbox_connector;
+    struct VBVAMODEHINT *hints;
+    int rc;
+
+    rc = VBoxHGSMIGetModeHints(&vbox->submit_info, vbox->num_crtcs,
+                               vbox->last_mode_hints);
+    AssertMsgRCReturnVoid(rc, ("VBoxHGSMIGetModeHints failed, rc=%Rrc.\n", rc));
+    drm_modeset_lock_all(dev);
+    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];
+        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,
+                     (short)hints->cx, (short)hints->cy, (int)hints->fEnabled,
+                     (short)hints->dx, (short)hints->dy));
+            vbox_connector->mode_hint.width = hints->cx & 0x8fff;
+            vbox_connector->mode_hint.height = hints->cy & 0x8fff;
+            vbox_connector->mode_hint.disconnected = !(hints->fEnabled);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
+            if ((hints->dx < 0xffff) && (hints->dy < 0xffff)) {
+                drm_object_property_set_value(&connector->base,
+                    dev->mode_config.suggested_x_property, hints->dx & 0x8fff);
+                drm_object_property_set_value(&connector->base,
+                    dev->mode_config.suggested_y_property, hints->dy & 0x8fff);
+            }
+#endif
+        }
+    }
+    drm_modeset_unlock_all(dev);
+}
+
 static void vbox_hotplug_worker(struct work_struct *work)
 {
@@ -84 +125 @@
 
     LogFunc(("vboxvideo: %d: vbox=%p\n", __LINE__, vbox));
+    vbox_update_mode_hints(vbox);
     drm_kms_helper_hotplug_event(vbox->dev);
     if (vbox->fbdev)
@@ -94 +136 @@
 
     LogFunc(("vboxvideo: %d: vbox=%p\n", __LINE__, vbox));
+    vbox_update_mode_hints(vbox);
         ret = drm_irq_install(vbox->dev, vbox->dev->pdev->irq);
         if (unlikely(ret != 0)) {

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

@@ -360 +360 @@
     dev->mode_config.max_height = VBE_DISPI_MAX_YRES;
 
+    ret = vbox_mode_init(dev);
+    if (ret)
+        goto out_free;
+
     ret = vbox_irq_init(vbox);
-    if (ret)
-        goto out_free;
-
-    ret = vbox_mode_init(dev);
     if (ret)
         goto out_free;
@@ -375 +375 @@
     return 0;
 out_free:
+    vbox_irq_fini(vbox);
     if (vbox->vram)
         pci_iounmap(dev->pdev, vbox->vram);
@@ -389 +390 @@
     LogFunc(("vboxvideo: %d\n", __LINE__));
     vbox_fbdev_fini(dev);
+    vbox_irq_fini(vbox);
     vbox_mode_fini(dev);
-    vbox_irq_fini(vbox);
     drm_mode_config_cleanup(dev);
 

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

@@ -412 +412 @@
 }
 
-static void vboxUpdateHints(struct vbox_connector *vbox_connector)
-{
-    struct vbox_private *pVBox;
-    int rc;
-
-    LogFunc(("vboxvideo: %d: vbox_connector=%p\n", __LINE__, vbox_connector));
-    pVBox = vbox_connector->base.dev->dev_private;
-    rc = VBoxHGSMIGetModeHints(&pVBox->submit_info, pVBox->num_crtcs, pVBox->last_mode_hints);
-    AssertMsgRCReturnVoid(rc, ("VBoxHGSMIGetModeHints failed, rc=%Rrc.\n", rc));
-    if (pVBox->last_mode_hints[vbox_connector->crtc_id].magic == VBVAMODEHINT_MAGIC)
-    {
-        vbox_connector->mode_hint.width = pVBox->last_mode_hints[vbox_connector->crtc_id].cx & 0x8fff;
-        vbox_connector->mode_hint.height = pVBox->last_mode_hints[vbox_connector->crtc_id].cy & 0x8fff;
-        vbox_connector->mode_hint.disconnected = !(pVBox->last_mode_hints[vbox_connector->crtc_id].fEnabled);
-        LogFunc(("vboxvideo: %d: width=%u, height=%u, disconnected=%RTbool\n", __LINE__,
-                 (unsigned)vbox_connector->mode_hint.width, (unsigned)vbox_connector->mode_hint.height,
-                 vbox_connector->mode_hint.disconnected));
-    }
-}
-
 static int vbox_get_modes(struct drm_connector *connector)
 {
@@ -441 +421 @@
     LogFunc(("vboxvideo: %d: connector=%p\n", __LINE__, connector));
     vbox_connector = to_vbox_connector(connector);
-    vboxUpdateHints(vbox_connector);
     cModes = drm_add_modes_noedid(connector, 2560, 1600);
     widthPreferred = vbox_connector->mode_hint.width ? vbox_connector->mode_hint.width : 1024;
@@ -486 +465 @@
     LogFunc(("vboxvideo: %d: connector=%p\n", __LINE__, connector));
     vbox_connector = to_vbox_connector(connector);
-    vboxUpdateHints(vbox_connector);
     return !vbox_connector->mode_hint.disconnected;
 }
@@ -578 +556 @@
     connector->doublescan_allowed = 0;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
+    drm_mode_create_suggested_offset_properties(dev);
+    drm_object_attach_property(&connector->base,
+                               dev->mode_config.suggested_x_property, 0);
+    drm_object_attach_property(&connector->base,
+                               dev->mode_config.suggested_y_property, 0);
+#endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
     drm_sysfs_connector_add(connector);