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

Timestamp:

Mar 22, 2017 8:18:00 AM (8 years ago)

Author:

vboxsync

Message:

bugref:4567: Linux kernel driver maintenance: [vboxvideo] Add support for PRIME. Contributed by Andreas Pokorny/Canonical.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• Makefile.module.kms (modified) (1 diff)
• files_vboxvideo_drv (modified) (1 diff)
• vbox_drv.c (modified) (2 diffs)
• vbox_drv.h (modified) (1 diff)
• vbox_prime.c (added)

trunk/src/VBox/Additions/linux/drm/Makefile.module.kms

@@ -37 +37 @@
 MOD_OBJS   = HGSMIBase.o HGSMICommon.o HGSMIMemAlloc.o \
              Modesetting.o vbox_drv.o vbox_fb.o vbox_irq.o vbox_main.o \
-             vbox_mode.o vbox_ttm.o VBVABase.o
+             vbox_mode.o vbox_ttm.o VBVABase.o vbox_prime.o
 
 MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -fno-pie

trunk/src/VBox/Additions/linux/drm/files_vboxvideo_drv

@@ -53 +53 @@
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_main.c=>vbox_main.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_mode.c=>vbox_mode.c \
+    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_prime.c=>vbox_prime.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_ttm.c=>vbox_ttm.c \
     ${PATH_ROOT}/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp=>HGSMICommon.c \

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

@@ -273 +273 @@
 static struct drm_driver driver =
 {
-    .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
+    .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_PRIME,
     .dev_priv_size = 0,
 
@@ -302 +302 @@
     .dumb_destroy = drm_gem_dumb_destroy,
 #endif
+    .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
+    .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
+    .gem_prime_export = drm_gem_prime_export,
+    .gem_prime_import = drm_gem_prime_import,
+    .gem_prime_pin = vbox_gem_prime_pin,
+    .gem_prime_unpin = vbox_gem_prime_unpin,
+    .gem_prime_get_sg_table = vbox_gem_prime_get_sg_table,
+    .gem_prime_import_sg_table = vbox_gem_prime_import_sg_table,
+    .gem_prime_vmap = vbox_gem_prime_vmap,
+    .gem_prime_vunmap = vbox_gem_prime_vunmap,
+    .gem_prime_mmap = vbox_gem_prime_mmap,
 
 };

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

@@ -321 +321 @@
 int vbox_mmap(struct file *filp, struct vm_area_struct *vma);
 
+/*vbox_prime*/
+int vbox_gem_prime_pin(struct drm_gem_object *obj);
+void vbox_gem_prime_unpin(struct drm_gem_object *obj);
+struct sg_table *vbox_gem_prime_get_sg_table(struct drm_gem_object *obj);
+struct drm_gem_object *vbox_gem_prime_import_sg_table(
+        struct drm_device *dev,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
+        size_t size,
+#else
+        struct dma_buf_attachment *attach,
+#endif
+        struct sg_table *table);
+void *vbox_gem_prime_vmap(struct drm_gem_object *obj);
+void vbox_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
+int vbox_gem_prime_mmap(struct drm_gem_object *obj,
+        struct vm_area_struct *area);
+
 /* vbox_irq.c */
 int vbox_irq_init(struct vbox_private *vbox);