Changeset 50902 in vbox for trunk/src/VBox

Timestamp:

Mar 26, 2014 10:05:24 PM (11 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: add host mouse cursor support to the kernel video driver.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.c (modified) (2 diffs)
• vbox_drv.h (modified) (2 diffs)

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

@@ -102 +102 @@
 };
 
+/* Intercept the old-style cursor IOCtl which does not pass the hot-spot to stop
+ * the kernel from translating it to a new-style one with a zero hot-spot, which
+ * we do not want. */
+static long vbox_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+{
+    if (cmd != DRM_IOCTL_MODE_CURSOR)
+        return drm_ioctl(filp, cmd, arg);
+    return -EINVAL;
+}
+
+#ifdef CONFIG_COMPAT
+static long vbox_compat_ioctl(struct file *filp, unsigned int cmd, 
+                              unsigned long arg)
+{
+    if (cmd != DRM_IOCTL_MODE_CURSOR)
+        return drm_compat_ioctl(filp, cmd, arg);
+    return -EINVAL;
+}
+#endif
 
 static const struct file_operations vbox_fops =
@@ -108 +127 @@
     .open = drm_open,
     .release = drm_release,
-    .unlocked_ioctl = drm_ioctl,
+    .unlocked_ioctl = vbox_ioctl,
     .mmap = vbox_mmap,
     .poll = drm_poll,
     .fasync = drm_fasync,
 #ifdef CONFIG_COMPAT
-    .compat_ioctl = drm_compat_ioctl,
+    .compat_ioctl = vbox_compat_ioctl,
 #endif
     .read = drm_read,

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

@@ -77 +77 @@
 #define DRIVER_MINOR        0
 #define DRIVER_PATCHLEVEL   0
+
+#define VBOX_MAX_CURSOR_WIDTH  64
+#define VBOX_MAX_CURSOR_HEIGHT 64
 
 struct vbox_fbdev;
@@ -108 +111 @@
     } ttm;
 
-    struct drm_gem_object *cursor_cache;
-    uint64_t cursor_cache_gpu_addr;
-    struct ttm_bo_kmap_obj cache_kmap;
-    int next_cursor;
     spinlock_t dev_lock;
 };