Changeset 64425 in vbox for trunk/src/VBox/Additions/linux/drm

Timestamp:

Oct 26, 2016 7:26:46 AM (8 years ago)

Author:

vboxsync

Message:

bugref:8614: Additions/common/VBoxVideo: make the code more self-contained: remove final dependencies on vboxguest in vboxvideo.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• Makefile.module.kms (modified) (1 diff)
• files_vboxvideo_drv (modified) (1 diff)
• vbox_irq.c (modified) (1 diff)
• vbox_main.c (modified) (1 diff)

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

@@ -38 +38 @@
 endif
 
-ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxvideo),)
- MANGLING := $(KBUILD_EXTMOD)/vboxvideo/include/VBox/VBoxGuestMangling.h
-else
- MANGLING := $(KBUILD_EXTMOD)/include/VBox/VBoxGuestMangling.h
-endif
-MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -include $(MANGLING) -fno-pie
+MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -fno-pie
 MOD_INCL   = $(addprefix -I$(KBUILD_EXTMOD),/ /include)
 # What on earth is this?

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

@@ -33 +33 @@
     ${PATH_ROOT}/include/iprt/types.h=>include/iprt/types.h \
     ${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \
-    ${PATH_ROOT}/include/iprt/mangling.h=>include/iprt/mangling.h \
     ${PATH_ROOT}/include/VBox/cdefs.h=>include/VBox/cdefs.h \
     ${PATH_ROOT}/include/VBox/err.h=>include/VBox/err.h \
     ${PATH_ROOT}/include/VBox/types.h=>include/VBox/types.h \
-    ${PATH_ROOT}/include/VBox/VBoxGuestMangling.h=>include/VBox/VBoxGuestMangling.h \
     ${PATH_ROOT}/include/VBox/VBoxVideo.h=>include/VBox/VBoxVideo.h \
     ${PATH_ROOT}/include/VBox/VBoxVideoGuest.h=>include/VBox/VBoxVideoGuest.h \

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

@@ -101 +101 @@
     rc = VBoxHGSMIGetModeHints(&vbox->submit_info, vbox->num_crtcs,
                                vbox->last_mode_hints);
-    AssertMsgRCReturnVoid(rc, ("VBoxHGSMIGetModeHints failed, rc=%Rrc.\n", rc));
+    if RT_FAILURE(rc) {
+        printk("vboxvideo: VBoxHGSMIGetModeHints failed, rc=%i.\n", rc);
+        return;
+    }
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
     drm_modeset_lock_all(dev);

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

@@ -79 +79 @@
                                            + vram_map_offset
                                            + i * VBVA_MIN_BUFFER_SIZE);
-            if (!VBoxVBVAEnable(&vbox->vbva_info[i], &vbox->submit_info, vbva, i))
-                AssertReleaseMsgFailed(("VBoxVBVAEnable failed - heap allocation error, very old host or driver error.\n"));
+            if (!VBoxVBVAEnable(&vbox->vbva_info[i], &vbox->submit_info, vbva, i)) {
+                /* very old host or driver error. */
+                printk(KERN_ERR "vboxvideo: VBoxVBVAEnable failed - heap allocation error.\n");
+                return;
+            }
         }
     }