Changeset 76937 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 22, 2019 4:39:05 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128314

Message:

Additions/linux/vboxvideo: Fix reporting invalid suggested-offset-properties
(Partial commit of kernel change.)
bugref:8282: Additions/linux: track kernel changes to vboxvideo in our own tree

The x and y hints receives from the host are unsigned 32 bit integers and
they get set to -1 (0xffffffff) when invalid. Before this commit the
vboxvideo driver was storing them in an u16 causing the -1 to be truncated
to 65535 which, once reported to userspace, was breaking gnome 3.26+
in Wayland mode.

This commit stores the host values in 32 bit variables, removing the
truncation and checks for -1, replacing it with 0 as -1 is not a valid
suggested-offset-property value. Likewise the properties are now
initialized to 0 instead of -1, since -1 is not a valid value.
This fixes gnome 3.26+ in Wayland mode not working with the vboxvideo
driver.

Reported-by: Gianfranco Costamagna <locutusofborg@…>
Cc: stable@…
Cc: Michael Thayer <michael.thayer@…>
Signed-off-by: Hans de Goede <hdegoede@…>
Signed-off-by: Greg Kroah-Hartman <gregkh@…>

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.h (modified) (1 diff)
• vbox_irq.c (modified) (1 diff)

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

@@ -237 +237 @@
         struct vbox_crtc *vbox_crtc;
         struct {
-                u16 width;
-                u16 height;
+                u32 width;
+                u32 height;
                 bool disconnected;
         } mode_hint;

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

@@ -159 +159 @@
                 disconnected = !(hints->fEnabled);
                 crtc_id = vbox_conn->vbox_crtc->crtc_id;
-                vbox_conn->mode_hint.width = hints->cx & 0x8fff;
-                vbox_conn->mode_hint.height = hints->cy & 0x8fff;
+                vbox_conn->mode_hint.width = hints->cx;
+                vbox_conn->mode_hint.height = hints->cy;
                 vbox_conn->vbox_crtc->x_hint = hints->dx;
                 vbox_conn->vbox_crtc->y_hint = hints->dy;