Changeset 109111 in vbox

Timestamp:

Apr 29, 2025 5:00:16 PM (10 days ago)

Author:

vboxsync

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

168661

Message:

Additions: Linux: vboxvideo: Additional fixes for kernel 6.15, bugref:10891.

• Add missing aperture_remove_conflicting_pci_devices() call to replace simpledrm after initial boot,
• Do not provide dummy .gem_prime_import_sg_table interface to prevent our self-coocked warning from being triggered.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.c (modified) (3 diffs)
• vbox_prime.c (modified) (1 diff)

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

@@ -44 +44 @@
 #endif
 
+#if RTLNX_VER_MIN(6,13,0) && defined(CONFIG_APERTURE_HELPERS)
+# include <linux/aperture.h>
+#endif
+
 #if RTLNX_VER_RANGE(5,14,0, 6,13,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
 # include <drm/drm_aperture.h>
@@ -95 +99 @@
 #endif
 
-# if RTLNX_VER_RANGE(5,14,0, 6,13,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
+# if RTLNX_VER_MIN(6,13,0) && defined(CONFIG_APERTURE_HELPERS)
+        ret = aperture_remove_conflicting_pci_devices(pdev, driver.name);
+# elif RTLNX_VER_RANGE(5,14,0, 6,13,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
 #  if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_RANGE(8,7, 8,99) || RTLNX_RHEL_MIN(9,1) || RTLNX_SUSE_MAJ_PREREQ(15,4)
         ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
@@ -415 +421 @@
 #endif
         .gem_prime_import = drm_gem_prime_import,
+#if RTLNX_VER_MAX(6,15,0)
         .gem_prime_import_sg_table = vbox_gem_prime_import_sg_table,
+#endif
 #if RTLNX_VER_MAX(6,6,0) && !RTLNX_RHEL_RANGE(9,4, 9,99) && !RTLNX_SUSE_MAJ_PREREQ(15, 6)
         .gem_prime_mmap = vbox_gem_prime_mmap,

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

@@ -50 +50 @@
 }
 
-#if RTLNX_VER_MAX(3,18,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
+#if RTLNX_VER_MAX(6,15,0)
+# if RTLNX_VER_MAX(3,18,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
 struct drm_gem_object *vbox_gem_prime_import_sg_table(
         struct drm_device *dev, size_t size, struct sg_table *table)
-#else
+# else
 struct drm_gem_object *vbox_gem_prime_import_sg_table(
         struct drm_device *dev, struct dma_buf_attachment *attach,
         struct sg_table *table)
-#endif
+# endif
 {
         WARN_ONCE(1, "not implemented");
         return ERR_PTR(-ENOSYS);
 }
+#endif
 
 void *vbox_gem_prime_vmap(struct drm_gem_object *obj)