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

Timestamp:

Apr 1, 2016 3:50:39 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: set up mouse multi-screen input mapping correctly in kernel video driver, second try.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -123 +123 @@
     bool fbdev_init;
     struct work_struct hotplug_work;
+    uint32_t input_mapping_width;
+    uint32_t input_mapping_height;
 };
 

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

@@ -237 +237 @@
     /* vbox_set_start_address_crt1(crtc, (u32)gpu_addr); */
     vbox_crtc->fb_offset = gpu_addr;
-    if (vbox_crtc->crtc_id == 0)
-        VBoxHGSMIUpdateInputMapping(&vbox->submit_info, 0, 0,
-                                    CRTC_FB(crtc)->width,
-                                    CRTC_FB(crtc)->height);
-
+    if (vbox_crtc->crtc_id == 0) {
+        vbox->input_mapping_width = CRTC_FB(crtc)->width;
+        vbox->input_mapping_height = CRTC_FB(crtc)->height;
+    }
     LogFunc(("vboxvideo: %d: vbox_fb=%p, obj=%p, bo=%p, gpu_addr=%u\n",
              __LINE__, vbox_fb, obj, bo, (unsigned)gpu_addr));
@@ -269 +268 @@
     if (!rc)
         vbox_do_modeset(crtc, mode);
+    /* Note that the input mapping is always relative to the first screen. */
+    VBoxHGSMIUpdateInputMapping(&vbox->submit_info, 0, 0,
+                                vbox->input_mapping_width,
+                                vbox->input_mapping_height);
     mutex_unlock(&vbox->hw_mutex);
     LogFunc(("vboxvideo: %d\n", __LINE__));