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

Timestamp:

Mar 26, 2024 10:50:45 AM (10 months ago)

Author:

vboxsync

Message:

Additions: Linux: vboxvideo: Introduce initial support for kernel 6.9, bugref:10630.

File:

• trunk/src/VBox/Additions/linux/drm/vbox_ttm.c (modified) (4 diffs)

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

@@ -533 +533 @@
 
         bo->placement.placement = bo->placements;
+#if RTLNX_VER_MAX(6,9,0)
         bo->placement.busy_placement = bo->placements;
+#endif
 
         if (mem_type & VBOX_MEM_TYPE_VRAM) {
-#if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99)
+#if RTLNX_VER_MIN(6,9,0)
+                bo->placements[c].mem_type = TTM_PL_VRAM;
+                PLACEMENT_FLAGS(bo->placements[c++]) = TTM_PL_FLAG_DESIRED;
+#elif RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99)
                 bo->placements[c].mem_type = TTM_PL_VRAM;
                 PLACEMENT_FLAGS(bo->placements[c++]) = 0;
@@ -549 +554 @@
         }
         if (mem_type & VBOX_MEM_TYPE_SYSTEM) {
-#if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99)
+
+#if RTLNX_VER_MIN(6,9,0)
+                bo->placements[c].mem_type = TTM_PL_SYSTEM;
+                PLACEMENT_FLAGS(bo->placements[c++]) = TTM_PL_FLAG_DESIRED;
+#elif RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99)
                 bo->placements[c].mem_type = TTM_PL_SYSTEM;
                 PLACEMENT_FLAGS(bo->placements[c++]) = 0;
@@ -562 +571 @@
         }
         if (!c) {
-#if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99)
+#if RTLNX_VER_MIN(6,9,0)
+                bo->placements[c].mem_type = TTM_PL_SYSTEM;
+                PLACEMENT_FLAGS(bo->placements[c++]) = TTM_PL_FLAG_DESIRED;
+#elif RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99)
                 bo->placements[c].mem_type = TTM_PL_SYSTEM;
                 PLACEMENT_FLAGS(bo->placements[c++]) = 0;
@@ -576 +588 @@
 
         bo->placement.num_placement = c;
+#if RTLNX_VER_MAX(6,9,0)
         bo->placement.num_busy_placement = c;
+#endif
 
 #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)