Changeset 71946 in vbox for trunk

Timestamp:

Apr 20, 2018 2:54:27 PM (7 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: drop some workarounds. No bugref.
Drop a workaround in the drm driver for old 5.0 VirtualBox hosts and for
old drm clients versions which were never used in distributions we supported.

File:

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

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

@@ -769 +769 @@
         bool src_isiomem;
 
-        /*
-         * Re-set this regularly as in 5.0.20 and earlier the information was
-         * lost on save and restore.
-         */
-        VBoxHGSMIUpdateInputMapping(vbox->guest_pool, 0, 0,
-                                    vbox->input_mapping_width,
-                                    vbox->input_mapping_height);
         if (!handle) {
                 bool cursor_enabled = false;
@@ -825 +818 @@
                         mask_size = ((width + 7) / 8 * height + 3) & ~3;
                         data_size = width * height * 4 + mask_size;
-                        vbox->cursor_hot_x = min_t(u32, max(hot_x, 0), width);
-                        vbox->cursor_hot_y = min_t(u32, max(hot_y, 0), height);
+                        vbox->cursor_hot_x = hot_x;
+                        vbox->cursor_hot_y = hot_y;
                         vbox->cursor_width = width;
                         vbox->cursor_height = height;
@@ -876 +869 @@
 {
         struct vbox_private *vbox = crtc->dev->dev_private;
-        u32 flags = VBOX_MOUSE_POINTER_VISIBLE |
-            VBOX_MOUSE_POINTER_SHAPE | VBOX_MOUSE_POINTER_ALPHA;
         s32 crtc_x =
             vbox->single_framebuffer ? crtc->x : to_vbox_crtc(crtc)->x_hint;
         s32 crtc_y =
             vbox->single_framebuffer ? crtc->y : to_vbox_crtc(crtc)->y_hint;
-        u32 host_x, host_y;
-        u32 hot_x = 0;
-        u32 hot_y = 0;
         int rc;
 
-        /*
-         * We compare these to unsigned later and don't
-         * need to handle negative.
-         */
-        if (x + crtc_x < 0 || y + crtc_y < 0 || vbox->cursor_data_size == 0)
+        x += vbox->cursor_hot_x;
+        y += vbox->cursor_hot_y;
+        if (x + crtc_x < 0 || y + crtc_y < 0 ||
+                x + crtc_x >= vbox->input_mapping_width ||
+                y + crtc_y >= vbox->input_mapping_width ||
+                vbox->cursor_data_size == 0)
                 return 0;
-
         rc = VBoxHGSMICursorPosition(vbox->guest_pool, true, x + crtc_x,
-                                     y + crtc_y, &host_x, &host_y);
-        /* Work around a bug after save and restore in 5.0.20 and earlier. */
-        if (RT_FAILURE(rc) || (host_x == 0 && host_y == 0))
-                return rc == VINF_SUCCESS ? 0
-                    : rc == VERR_NO_MEMORY ? -ENOMEM : -EINVAL;
-        if (x + crtc_x < host_x)
-                hot_x = min(host_x - x - crtc_x, vbox->cursor_width);
-        if (y + crtc_y < host_y)
-                hot_y = min(host_y - y - crtc_y, vbox->cursor_height);
-        if (hot_x == vbox->cursor_hot_x && hot_y == vbox->cursor_hot_y)
-                return 0;
-        vbox->cursor_hot_x = hot_x;
-        vbox->cursor_hot_y = hot_y;
-        rc = VBoxHGSMIUpdatePointerShape(vbox->guest_pool, flags, hot_x, hot_y,
-                                         vbox->cursor_width,
-                                         vbox->cursor_height, vbox->cursor_data,
-                                         vbox->cursor_data_size);
+                                         y + crtc_y, NULL, NULL);
         return rc == VINF_SUCCESS ? 0 : rc == VERR_NO_MEMORY ? -ENOMEM : rc ==
-            VERR_NOT_SUPPORTED ? -EBUSY : -EINVAL;
-}
+                VERR_NOT_SUPPORTED ? -EBUSY : -EINVAL;
+}