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

Timestamp:

May 25, 2021 4:23:05 PM (4 years ago)

Author:

vboxsync

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

144624

Message:

Additions: Linux: vboxvideo: adapt code to 5.13-rc3 changes, bugref:10020.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -174 +174 @@
 #include <drm/ttm/ttm_bo_driver.h>
 #include <drm/ttm/ttm_placement.h>
-#include <drm/ttm/ttm_memory.h>
+#if RTLNX_VER_MAX(5,13,0)
+# include <drm/ttm/ttm_memory.h>
+#endif
 #if RTLNX_VER_MAX(5,12,0)
 # include <drm/ttm/ttm_module.h>
@@ -264 +266 @@
                 struct ttm_bo_global_ref bo_global_ref;
 #endif
+#if RTLNX_VER_MIN(5,13,0)
+                struct ttm_device bdev;
+#else
                 struct ttm_bo_device bdev;
+#endif
                 bool mm_initialised;
         } ttm;

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

@@ -49 +49 @@
 
 
+#if RTLNX_VER_MIN(5,13,0)
+static inline struct vbox_private *vbox_bdev(struct ttm_device *bd)
+#else
 static inline struct vbox_private *vbox_bdev(struct ttm_bo_device *bd)
+#endif
 {
         return container_of(bd, struct vbox_private, ttm.bdev);
@@ -206 +210 @@
 }
 #else
+# if RTLNX_VER_MAX(5,13,0)
 static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
                                    struct ttm_resource *mem)
+# else /* > 5.13.0 */
+static int vbox_ttm_io_mem_reserve(struct ttm_device *bdev,
+                                   struct ttm_resource *mem)
+# endif /* > 5.13.0 */
 {
         struct vbox_private *vbox = vbox_bdev(bdev);
@@ -242 +251 @@
 
 
-#if RTLNX_VER_MIN(5,10,0)
+#if RTLNX_VER_MIN(5,13,0)
+static void vbox_ttm_io_mem_free(struct ttm_device *bdev,
+                                 struct ttm_resource *mem)
+{
+}
+#elif RTLNX_VER_MIN(5,10,0)
 static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev,
                                  struct ttm_resource *mem)
@@ -254 +268 @@
 #endif
 
-#if RTLNX_VER_MIN(5,10,0)
+#if RTLNX_VER_MIN(5,13,0)
+static void vbox_ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *tt)
+{
+        ttm_tt_fini(tt);
+        kfree(tt);
+}
+#elif RTLNX_VER_MIN(5,10,0)
 static void vbox_ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *tt)
 {
@@ -334 +354 @@
 #endif
 
+#if RTLNX_VER_MIN(5,13,0)
+static struct ttm_device_funcs vbox_bo_driver = {
+#else /* < 5.13.0 */
 static struct ttm_bo_driver vbox_bo_driver = {
+#endif /* < 5.13.0 */
         .ttm_tt_create = vbox_ttm_tt_create,
 #if RTLNX_VER_MIN(5,10,0)
@@ -371 +395 @@
         int ret;
         struct drm_device *dev = vbox->dev;
+#if RTLNX_VER_MIN(5,13,0)
+        struct ttm_device *bdev = &vbox->ttm.bdev;
+#else
         struct ttm_bo_device *bdev = &vbox->ttm.bdev;
+#endif
 
 #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
@@ -378 +406 @@
                 return ret;
 #endif
+#if RTLNX_VER_MIN(5,13,0)
+        ret = ttm_device_init(&vbox->ttm.bdev,
+#else
         ret = ttm_bo_device_init(&vbox->ttm.bdev,
+#endif
 #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
                                  vbox->ttm.bo_global_ref.ref.object,
@@ -430 +462 @@
 
 err_device_release:
+#if RTLNX_VER_MIN(5,13,0)
+        ttm_device_fini(&vbox->ttm.bdev);
+#else
         ttm_bo_device_release(&vbox->ttm.bdev);
+#endif
 #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
 err_ttm_global_release:
@@ -447 +483 @@
         arch_phys_wc_del(vbox->fb_mtrr);
 #endif
+#if RTLNX_VER_MIN(5,13,0)
+        ttm_device_fini(&vbox->ttm.bdev);
+#else
         ttm_bo_device_release(&vbox->ttm.bdev);
+#endif
 #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
         vbox_ttm_global_release(vbox);
@@ -529 +569 @@
         struct vbox_private *vbox = dev->dev_private;
         struct vbox_bo *vboxbo;
+#if RTLNX_VER_MAX(5,13,0)
         size_t acc_size;
+#endif
         int ret;
 
@@ -552 +594 @@
         vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_VRAM | VBOX_MEM_TYPE_SYSTEM);
 
+#if RTLNX_VER_MAX(5,13,0)
         acc_size = ttm_bo_dma_acc_size(&vbox->ttm.bdev, size,
                                        sizeof(struct vbox_bo));
+#endif
 
         ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
@@ -559 +603 @@
 #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
                           align >> PAGE_SHIFT, false, NULL, acc_size,
-#else
+#elif RTLNX_VER_MAX(5,13,0) /* < 5.13.0 */
                           align >> PAGE_SHIFT, false, acc_size,
-#endif
+#else /* > 5.13.0 */
+                          align >> PAGE_SHIFT, false,
+#endif /* > 5.13.0 */
 #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
                           NULL, NULL, vbox_bo_ttm_destroy);