Changeset 60123 in vbox for trunk/src/VBox/Additions/linux/drm

Timestamp:

Mar 21, 2016 2:40:17 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8288: Additions/x11: rework VBoxClient video mode hint handling: limit the screen size to 800x600 until after we have created the frame-buffer console so that it does not end up with a random size every time. At present we cannot resize it any way.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.h (modified) (1 diff)
• vbox_fb.c (modified) (1 diff)
• vbox_mode.c (modified) (2 diffs)

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

@@ -119 +119 @@
     struct mutex hw_mutex;
     bool isr_installed;
+    /** Have we finished fbdev initialisation?  We limit reported display
+     * modes to 800x600 until this point to get a sensible console size. */
+    bool fbdev_init;
     struct work_struct hotplug_work;
 };

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

@@ -439 +439 @@
     if (ret)
         goto fini;
+    vbox->fbdev_init = true;
 
     LogFunc(("vboxvideo: %d\n", __LINE__));

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

@@ -427 +427 @@
     struct vbox_connector *vbox_connector = NULL;
     struct drm_display_mode *mode = NULL;
+    struct vbox_private *vbox = NULL;
     unsigned num_modes = 0;
     int preferred_width, preferred_height;
@@ -432 +433 @@
     LogFunc(("vboxvideo: %d: connector=%p\n", __LINE__, connector));
     vbox_connector = to_vbox_connector(connector);
+    vbox = connector->dev->dev_private;
+    if (!vbox->fbdev_init)
+        return drm_add_modes_noedid(connector, 800, 600);
     num_modes = drm_add_modes_noedid(connector, 2560, 1600);
     preferred_width = vbox_connector->mode_hint.width ? vbox_connector->mode_hint.width : 1024;