Changeset 67169 in vbox for trunk

Timestamp:

May 31, 2017 12:43:59 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
Use the functions from linux/genalloc.h instead of the vbox custom
HGSMIMalloc implementation.

Signed-off-by: Hans de Goede <hdegoede@…>
Adjusted to apply to current trunk and to build on Linux 3.11 and 3.12.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• HGSMIBase.h (added)
• Makefile.module.kms (modified) (1 diff)
• VBoxVideoIPRT.h (modified) (3 diffs)
• files_vboxvideo_drv (modified) (4 diffs)
• vbox_hgsmi.c (added)
• vbox_main.c (modified) (4 diffs)

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

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

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

@@ -29 +29 @@
 #define ___VBox_VBoxVideoIPRT_h
 
-#include <asm/atomic.h>
 #include <asm/io.h>
 #include <iprt/cdefs.h>
-#include <iprt/list.h>
 #include <iprt/stdarg.h>
 #include <iprt/stdint.h>
+#include <iprt/types.h>
 
 #include <linux/string.h>
@@ -63 +62 @@
  * @{ */
 
-#define RT_ZERO(x) memset(&(x), 0, sizeof(x))
-#define ASMAtomicCmpXchgBool(b, new_val, old_val) \
-        (cmpxchg(b, old_val, new_val) == old_val)
-#define ASMAtomicWriteBool(b, val) xchg(b, val)
 #define ASMCompilerBarrier() mb()
 
@@ -113 +108 @@
 /** @}  */
 
+/** @name types for VirtualBox OS-independent code
+ * @{ */
+
+/* HGSMI uses 32 bit offsets and sizes. */
+typedef uint32_t HGSMISIZE;
+typedef uint32_t HGSMIOFFSET;
+
+/** @}  */
+
 #endif /* ___VBox_VBoxVideoIPRT_h */

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

@@ -22 +22 @@
     ${PATH_OUT}/product-generated.h=>product-generated.h \
     ${PATH_ROOT}/include/iprt/cdefs.h=>include/iprt/cdefs.h \
-    ${PATH_ROOT}/include/iprt/list.h=>include/iprt/list.h \
     ${PATH_ROOT}/include/iprt/stdarg.h=>include/iprt/stdarg.h \
     ${PATH_ROOT}/include/iprt/stdint.h=>include/iprt/stdint.h \
@@ -28 +27 @@
     ${PATH_ROOT}/include/VBox/Graphics/VBoxVideo.h=>include/VBoxVideo.h \
     ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoGuest.h=>include/VBoxVideoGuest.h \
-    ${PATH_ROOT}/include/VBox/Graphics/HGSMI.h=>include/HGSMI.h \
-    ${PATH_ROOT}/include/VBox/Graphics/HGSMIBase.h=>include/HGSMIBase.h \
     ${PATH_ROOT}/include/VBox/Graphics/HGSMIChannels.h=>include/HGSMIChannels.h \
     ${PATH_ROOT}/include/VBox/Graphics/HGSMIChSetup.h=>include/HGSMIChSetup.h \
     ${PATH_ROOT}/include/VBox/Graphics/HGSMIContext.h=>include/HGSMIContext.h \
     ${PATH_ROOT}/include/VBox/Graphics/HGSMIDefs.h=>include/HGSMIDefs.h \
-    ${PATH_ROOT}/include/VBox/Graphics/HGSMIMemAlloc.h=>include/HGSMIMemAlloc.h \
     ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoVBE.h=>include/VBoxVideoVBE.h \
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp=>HGSMIBase.c \
@@ -40 +36 @@
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp=>Modesetting.c \
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp=>VBVABase.c \
+    ${PATH_ROOT}/src/VBox/Additions/linux/drm/HGSMIBase.h=>include/HGSMIBase.h \
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/VBoxVideoIPRT.h=>include/VBoxVideoIPRT.h \
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_drv.c=>vbox_drv.c \
@@ -49 +46 @@
     ${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 \
-    ${PATH_ROOT}/src/VBox/GuestHost/HGSMI/HGSMIMemAlloc.cpp=>HGSMIMemAlloc.c \
+    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_hgsmi.c=>vbox_hgsmi.c \
     ${PATH_ROOT}/src/VBox/Installer/linux/Makefile.include.header=>Makefile.include.header \
     ${PATH_ROOT}/src/VBox/Installer/linux/Makefile.include.footer=>Makefile.include.footer \

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

@@ -259 +259 @@
 }
 
-/** Allocation function for the HGSMI heap and data. */
-static DECLCALLBACK(void *) alloc_hgsmi_environ(void *environ, HGSMISIZE size)
-{
-    NOREF(environ);
-    return kmalloc(size, GFP_KERNEL);
-}
-
-
-/** Free function for the HGSMI heap and data. */
-static DECLCALLBACK(void) free_hgsmi_environ(void *environ, void *ptr)
-{
-    NOREF(environ);
-    kfree(ptr);
-}
-
-
-/** Pointers to the HGSMI heap and data manipulation functions. */
-static HGSMIENV hgsmi_environ =
-{
-    NULL,
-    alloc_hgsmi_environ,
-    free_hgsmi_environ
-};
-
-
 /** Do we support the 4.3 plus mode hint reporting interface? */
 static bool have_hgsmi_mode_hints(struct vbox_private *vbox)
@@ -301 +276 @@
     vbox->full_vram_size = VBoxVideoGetVRAMSize();
     vbox->any_pitch = VBoxVideoAnyWidthAllowed();
+    int ret;
+
     DRM_INFO("VRAM %08x\n", vbox->full_vram_size);
 
@@ -309 +286 @@
         return -ENOMEM;
 
-    if (RT_FAILURE(VBoxHGSMISetupGuestContext(&vbox->submit_info, vbox->guest_heap,
-                                              GUEST_HEAP_USABLE_SIZE, GUEST_HEAP_OFFSET(vbox),
-                                              &hgsmi_environ)))
+    /* Create guest-heap mem-pool use 2^4 = 16 byte chunks */
+    vbox->submit_info.guest_pool = gen_pool_create(4, -1);
+    if (!vbox->submit_info.guest_pool)
         return -ENOMEM;
+
+    ret = gen_pool_add_virt(vbox->submit_info.guest_pool,
+                            (unsigned long)vbox->guest_heap,
+                            GUEST_HEAP_OFFSET(vbox),
+                            GUEST_HEAP_USABLE_SIZE, -1);
+    if (ret)
+        return ret;
+
     /* Reduce available VRAM size to reflect the guest heap. */
     vbox->available_vram_size = GUEST_HEAP_OFFSET(vbox);
@@ -400 +385 @@
     vbox_hw_fini(vbox);
     vbox_mm_fini(vbox);
+    if (vbox->submit_info.guest_pool)
+        gen_pool_destroy(vbox->submit_info.guest_pool);
     if (vbox->guest_heap)
         pci_iounmap(dev->pdev, vbox->guest_heap);