Changeset 60285 in vbox

Timestamp:

Apr 1, 2016 10:27:17 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

106328

Message:

bugref:8087: Additions/x11: support non-root X server: revert r106327: committed too much.

Location:

trunk/src/VBox/Additions/linux

Files:

• drm/vbox_drv.c (modified) (2 diffs)
• drm/vbox_drv.h (modified) (2 diffs)
• drm/vbox_mode.c (modified) (2 diffs)
• installer/vboxadd-x11.sh (modified) (1 diff)

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

@@ -193 +193 @@
 };
 
-static long vbox_ioctl(struct file *filp, unsigned int cmd,
-                                unsigned long arg)
-{
-    struct drm_file *file_priv = filp->private_data;
-    struct vbox_private *vbox = file_priv->minor->dev->dev_private;
-
-#ifdef DRM_IOCTL_MODE_CURSOR2
-    if ((cmd == DRM_IOCTL_MODE_CURSOR) && vbox != NULL)
-        vbox->have_cursor_hotspot = false;
-    if ((cmd == DRM_IOCTL_MODE_CURSOR2) && vbox != NULL)
-        vbox->have_cursor_hotspot = true;
-#endif
-    return drm_ioctl(filp, cmd, arg);
-}
 
 static const struct file_operations vbox_fops =
@@ -213 +199 @@
     .open = drm_open,
     .release = drm_release,
-    .unlocked_ioctl = vbox_ioctl,
+    .unlocked_ioctl = drm_ioctl,
     .mmap = vbox_mmap,
     .poll = drm_poll,

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

@@ -85 +85 @@
 #define VBOX_MAX_CURSOR_WIDTH  64
 #define VBOX_MAX_CURSOR_HEIGHT 64
-#define CURSOR_PIXEL_COUNT VBOX_MAX_CURSOR_WIDTH * VBOX_MAX_CURSOR_HEIGHT
-#define CURSOR_DATA_SIZE CURSOR_PIXEL_COUNT * 4 + CURSOR_PIXEL_COUNT / 8
 
 struct vbox_fbdev;
@@ -125 +123 @@
     bool fbdev_init;
     struct work_struct hotplug_work;
-    bool have_cursor_hotspot;
-    uint32_t cursor_width;
-    uint32_t cursor_height;
-    size_t cursor_data_size;
-    uint8_t cursor_data[CURSOR_DATA_SIZE];
-};
-
-#undef CURSOR_PIXEL_COUNT
-#undef CURSOR_DATA_SIZE
+};
 
 int vbox_driver_load(struct drm_device *dev, unsigned long flags);

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

@@ -678 +678 @@
             mask_size  = ((width + 7) / 8 * height + 3) & ~3;
             data_size = width * height * 4 + mask_size;
-            vbox->cursor_width = width;
-            vbox->cursor_height = height;
-            vbox->cursor_data_size = data_size;
-            dst = vbox->cursor_data;
-            ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &uobj_map);
-            if (!ret)
+            dst = kmalloc(data_size, GFP_KERNEL);
+            if (dst)
             {
-                src = ttm_kmap_obj_virtual(&uobj_map, &src_isiomem);
-                if (!src_isiomem)
+                ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &uobj_map);
+                if (!ret)
                 {
-                    uint32_t flags =   VBOX_MOUSE_POINTER_VISIBLE
-                                      | VBOX_MOUSE_POINTER_SHAPE
-                                      | VBOX_MOUSE_POINTER_ALPHA;
-                    copy_cursor_image(src, dst, width, height, mask_size);
-                    rc = VBoxHGSMIUpdatePointerShape(&vbox->submit_info, flags,
-                                                     hot_x, hot_y, width,
-                                                     height, dst, data_size);
-                    ret = -RTErrConvertToErrno(rc);
+                    src = ttm_kmap_obj_virtual(&uobj_map, &src_isiomem);
+                    if (!src_isiomem)
+                    {
+                        uint32_t flags =   VBOX_MOUSE_POINTER_VISIBLE
+                                          | VBOX_MOUSE_POINTER_SHAPE
+                                          | VBOX_MOUSE_POINTER_ALPHA;
+                        copy_cursor_image(src, dst, width, height, mask_size);
+                        rc = VBoxHGSMIUpdatePointerShape(&vbox->submit_info, flags,
+                                                         hot_x, hot_y, width,
+                                                         height, dst, data_size);
+                        ret = -RTErrConvertToErrno(rc);
+                    }
+                    else
+                        DRM_ERROR("src cursor bo should be in main memory\n");
+                    ttm_bo_kunmap(&uobj_map);
                 }
-                else
-                    DRM_ERROR("src cursor bo should be in main memory\n");
-                ttm_bo_kunmap(&uobj_map);
+                kfree(dst);
             }
-            else
-                vbox->cursor_data_size = 0;
             vbox_bo_unreserve(bo);
         }
@@ -719 +718 @@
 {
     struct vbox_private *vbox = crtc->dev->dev_private;
-    uint32_t flags =   VBOX_MOUSE_POINTER_VISIBLE
-                      | VBOX_MOUSE_POINTER_SHAPE
-                      | VBOX_MOUSE_POINTER_ALPHA;
-    uint32_t host_x, host_y;
-    uint32_t hot_x = 0;
-    uint32_t hot_y = 0;
-    int rc;
 
     VBoxHGSMICursorPosition(&vbox->submit_info, true, x + crtc->x,
-                            y + crtc->y, &host_x, &host_y);
-    if (!vbox->have_cursor_hotspot && vbox->cursor_data_size != 0) {
-        if (x + crtc->x > host_x)
-            hot_x = min(x + crtc->x - host_x, vbox->cursor_width);
-        if (y + crtc->y > host_y)
-            hot_y = min(y + crtc->y - host_y, vbox->cursor_height);
-        rc = VBoxHGSMIUpdatePointerShape(&vbox->submit_info, flags,
-                                         hot_x < 64 ? hot_x : 64,
-                                         hot_y < 64 ? hot_y : 64,
-                                         vbox->cursor_width,
-                                         vbox->cursor_height,
-                                         vbox->cursor_data,
-                                         vbox->cursor_data_size);
-        return -RTErrConvertToErrno(rc);
-    }
+                            y + crtc->y, NULL, NULL);
     return 0;
 }

trunk/src/VBox/Additions/linux/installer/vboxadd-x11.sh

@@ -368 +368 @@
                 vboxvideo_src=""
             }
+            # Do not install if we can use the kernel driver.
+            case `uname -r` in
+                1.* | 2.* | 3.[0-9].* | 3.10.* ) ;;
+                * ) vboxvideo_src="" ;;
+            esac
             ;;
         * )
             # For anything else, assume kernel drivers.
             dox11config=""
+            $MODPROBE vboxvideo ||
+                echo "Warning: failed to set up the X Window System display integration."
             ;;
     esac
-    if $MODPROBE vboxvideo; then
-        # Do not install if we can use the kernel driver.
-        rm -f "$modules_dir/drivers/vboxvideo_drv.so"
-        vboxvideo_src=""
-        dox11config=""
-    fi
     test -n "${dox11config}" &&
         begin "Installing $xserver_version modules"