Changeset 49627 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Nov 22, 2013 3:11:53 PM (11 years ago)

Author:

vboxsync

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

90852

Message:

Additions/linux/drm: add IOCtls to disable and re-start HGSMI in the KMS driver.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -48 +48 @@
 #include "vbox_drv.h"
 
+#include <VBox/VBoxGuest.h>
+
 #include <linux/module.h>
 #include <linux/console.h>
@@ -91 +93 @@
 };
 
+
+static struct drm_ioctl_desc vbox_ioctls[] =
+{
+    DRM_IOCTL_DEF_DRV(VBOX_DISABLE_HGSMI, VBoxDisableHGSMI,
+                      DRM_UNLOCKED|DRM_ROOT_ONLY),
+    DRM_IOCTL_DEF_DRV(VBOX_ENABLE_HGSMI, VBoxEnableHGSMI,
+                      DRM_UNLOCKED|DRM_ROOT_ONLY)
+};
+
+
 static const struct file_operations vbox_fops =
 {
@@ -114 +126 @@
     .unload = vbox_driver_unload,
 
+    .ioctls = vbox_ioctls,
+    .num_ioctls = RT_ELEMENTS(vbox_ioctls),
     .fops = &vbox_fops,
     .name = DRIVER_NAME,

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

@@ -90 +90 @@
     unsigned cCrtcs;
     bool vga2_clone;
+    /** Amount of available VRAM, including space used for buffers. */
+    uint32_t full_vram_size;
+    /** Amount of available VRAM, not including space used for buffers. */
     uint32_t vram_size;
+    /** Is HGSMI currently disabled? */
+    bool fDisableHGSMI;
 
     struct vbox_fbdev *fbdev;
@@ -161 +166 @@
 extern int vbox_mode_init(struct drm_device *dev);
 extern void vbox_mode_fini(struct drm_device *dev);
+extern void VBoxRefreshModes(struct drm_device *pDev);
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
@@ -222 +228 @@
           uint32_t flags, struct vbox_bo **pvboxbo);
 
+/** IOCtl handler to stop this driver using HGSMI so that user space can. */
+extern int VBoxDisableHGSMI(struct drm_device *dev, void *data,
+                            struct drm_file *file_priv);
+/** IOCtl handler to start this driver using HGSMI again. */
+extern int VBoxEnableHGSMI(struct drm_device *dev, void *data,
+                           struct drm_file *file_priv);
+
 int vbox_gem_create(struct drm_device *dev,
            u32 size, bool iskernel,