Changeset 59226 in vbox

Timestamp:

Dec 26, 2015 4:08:45 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: use 1024x768 in the KMS driver if there is no current preferred mode.

File:

• trunk/src/VBox/Additions/linux/drm/vbox_mode.c (modified) (1 diff)

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

@@ -414 +414 @@
     struct drm_display_mode *pMode = NULL;
     unsigned cModes = 0;
+    int cxPreferred, cyPreferred;
 
     LogFunc(("vboxvideo: %d: pConnector=%p\n", __LINE__, pConnector));
     pVBoxConnector = to_vbox_connector(pConnector);
     cModes = drm_add_modes_noedid(pConnector, 2560, 1600);
-    if (pVBoxConnector->modeHint.cX && pVBoxConnector->modeHint.cY)
-    {
-        pMode = drm_cvt_mode(pConnector->dev, pVBoxConnector->modeHint.cX,
-                             pVBoxConnector->modeHint.cY, 60, false, false,
-                             false);
-        if (pMode)
-        {
-            pMode->type |= DRM_MODE_TYPE_PREFERRED;
-            drm_mode_probed_add(pConnector, pMode);
-            ++cModes;
-        }
+    cxPreferred = pVBoxConnector->modeHint.cX ? pVBoxConnector->modeHint.cX : 1024;
+    cyPreferred = pVBoxConnector->modeHint.cY ? pVBoxConnector->modeHint.cY : 768;
+    pMode = drm_cvt_mode(pConnector->dev, cxPreferred, cyPreferred, 60, false,
+                         false, false);
+    if (pMode)
+    {
+        pMode->type |= DRM_MODE_TYPE_PREFERRED;
+        drm_mode_probed_add(pConnector, pMode);
+        ++cModes;
     }
     return cModes;