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

Timestamp:

Oct 13, 2017 4:03:36 PM (7 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: Fix reporting invalid suggested-offset-properties.
bugref:8524: Additions/linux: play nicely with distribution-installed Additions

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@…>
Signed-off-by: Hans de Goede <hdegoede@…>

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -179 +179 @@
         struct vbox_crtc *vbox_crtc;
         struct {
-                u16 width;
-                u16 height;
+                u32 width;
+                u32 height;
                 bool disconnected;
         } mode_hint;
@@ -192 +192 @@
         u32 fb_offset;
         bool cursor_enabled;
-        u16 x_hint;
-        u16 y_hint;
+        u32 x_hint;
+        u32 y_hint;
 };
 

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

@@ -161 +161 @@
                             | (disconnected ? VBVA_SCREEN_F_DISABLED :
                                VBVA_SCREEN_F_BLANK);
-                        vbox_connector->mode_hint.width = hints->cx & 0x8fff;
-                        vbox_connector->mode_hint.height = hints->cy & 0x8fff;
+                        vbox_connector->mode_hint.width = hints->cx;
+                        vbox_connector->mode_hint.height = hints->cy;
                         vbox_connector->vbox_crtc->x_hint = hints->dx;
                         vbox_connector->vbox_crtc->y_hint = hints->dy;

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

@@ -593 +593 @@
         }
         vbox_set_edid(connector, preferred_width, preferred_height);
+
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) || defined(RHEL_73)
-        drm_object_property_set_value(
-                &connector->base, vbox->dev->mode_config.suggested_x_property,
-                vbox_connector->vbox_crtc->x_hint);
-        drm_object_property_set_value(
-                &connector->base, vbox->dev->mode_config.suggested_y_property,
-                vbox_connector->vbox_crtc->y_hint);
+        if (vbox_connector->vbox_crtc->x_hint != -1)
+                drm_object_property_set_value(&connector->base,
+                        vbox->dev->mode_config.suggested_x_property,
+                        vbox_connector->vbox_crtc->x_hint);
+        else
+                drm_object_property_set_value(&connector->base,
+                        vbox->dev->mode_config.suggested_x_property, 0);
+
+        if (vbox_connector->vbox_crtc->y_hint != -1)
+                drm_object_property_set_value(&connector->base,
+                        vbox->dev->mode_config.suggested_y_property,
+                        vbox_connector->vbox_crtc->y_hint);
+        else
+                drm_object_property_set_value(&connector->base,
+                        vbox->dev->mode_config.suggested_y_property, 0);
 #endif
 
@@ -691 +701 @@
         drm_mode_create_suggested_offset_properties(dev);
         drm_object_attach_property(&connector->base,
-                                   dev->mode_config.suggested_x_property, -1);
+                                   dev->mode_config.suggested_x_property, 0);
         drm_object_attach_property(&connector->base,
-                                   dev->mode_config.suggested_y_property, -1);
+                                   dev->mode_config.suggested_y_property, 0);
 #endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) && !defined(RHEL_73)