Changeset 63807 in vbox for trunk

Timestamp:

Sep 13, 2016 8:19:12 AM (8 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: better work-around in the kernel vboxvideo driver for clients that do not send dirty rectangle information. However it only currently works for the first guest screen.

File:

• trunk/src/VBox/Additions/linux/drm/vbox_drv.c (modified) (2 diffs)

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

@@ -241 +241 @@
      * do not advertise dynamic modes on the first query and send a
      * tentative hotplug notification after that to see if they query again. */
-    vbox->initial_mode_queried = false;
-    return 0;
-}
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
-static void vbox_master_drop(struct drm_device *dev,
-                             struct drm_file *file_priv,
-                             bool from_release)
-#else
-static void vbox_master_drop(struct drm_device *dev,
-                             struct drm_file *file_priv)
-#endif
-{
-    struct vbox_private *vbox = dev->dev_private;
     vbox->initial_mode_queried = false;
     mutex_lock(&vbox->hw_mutex);
@@ -266 +252 @@
     vbox_disable_accel(vbox);
     mutex_unlock(&vbox->hw_mutex);
+    return 0;
+}
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
+static void vbox_master_drop(struct drm_device *dev,
+                             struct drm_file *file_priv,
+                             bool from_release)
+#else
+static void vbox_master_drop(struct drm_device *dev,
+                             struct drm_file *file_priv)
+#endif
+{
+    struct vbox_private *vbox = dev->dev_private;
+    /* See vbox_master_set() */
+    vbox->initial_mode_queried = false;
+    mutex_lock(&vbox->hw_mutex);
+    vbox_disable_accel(vbox);
+    mutex_unlock(&vbox->hw_mutex);
 }