Changeset 59223 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Dec 26, 2015 3:27:56 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: remove old modes on a connector before we probe new ones, as the probe already detects everything we want to offer, and we do not want modes we no longer want kept around.

File:

• trunk/src/VBox/Additions/linux/drm/vbox_mode.c (modified) (2 diffs)

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

@@ -466 +466 @@
 }
 
+static int vbox_fill_modes(struct drm_connector *pConnector, uint32_t xMax, uint32_t yMax)
+{
+    struct vbox_connector *pVBoxConnector;
+    struct drm_device *pDrmDev;
+    struct drm_display_mode *pMode, *pIter;
+
+    LogFunc(("vboxvideo: %d: pConnector=%p, xMax=%lu, yMax = %lu\n", __LINE__,
+             pConnector, (unsigned long)xMax, (unsigned long)yMax));
+    pVBoxConnector = to_vbox_connector(pConnector);
+    pDrmDev = pVBoxConnector->base.dev;
+    list_for_each_entry_safe(pMode, pIter, &pConnector->modes, head)
+    {
+        list_del(&pMode->head);
+        drm_mode_destroy(pDrmDev, pMode);
+    }
+    return drm_helper_probe_single_connector_modes(pConnector, xMax, yMax);
+}
+
 static const struct drm_connector_helper_funcs vbox_connector_helper_funcs =
 {
@@ -477 +495 @@
     .dpms = drm_helper_connector_dpms,
     .detect = vbox_connector_detect,
-    .fill_modes = drm_helper_probe_single_connector_modes,
+    .fill_modes = vbox_fill_modes,
     .destroy = vbox_connector_destroy,
 };