Changeset 109111 in vbox for trunk/src/VBox/Additions/linux/drm/vbox_prime.c

Timestamp:

Apr 29, 2025 5:00:16 PM (12 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.

File:

• trunk/src/VBox/Additions/linux/drm/vbox_prime.c (modified) (1 diff)

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)