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

Timestamp:

Feb 22, 2016 11:38:16 AM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: remove the old drm driver which is no longer serving a useful purpose - additional clean-up and fix export_modules script.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• Makefile.kmk (modified) (3 diffs)
• Makefile.module (deleted)
• files_vboxvideo_drm (deleted)
• vboxvideo_drm.h (deleted)

trunk/src/VBox/Additions/linux/drm/Makefile.kmk

@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-VBOX_WITH_GUEST_KMS_DRIVER = 1
-
 #
 # Populate FILES_VBOXVIDEO_DRM_NOBIN
 #
 INSTALLS += vboxvideo_drm-mod
-if !defined(VBOX_WITH_GUEST_KMS_DRIVER)
- include $(PATH_SUB_CURRENT)/files_vboxvideo_drm
-else
- include $(PATH_SUB_CURRENT)/files_vboxvideo_drv
-endif
+include $(PATH_SUB_CURRENT)/files_vboxvideo_drv
 vboxvideo_drm-mod_INST         = $(INST_ADDITIONS)src/vboxvideo/
 vboxvideo_drm-mod_SOURCES      = \
@@ -45 +39 @@
 #
 if defined(VBOX_WITH_ADDITION_DRIVERS)
- if !defined(VBOX_WITH_GUEST_KMS_DRIVER)
-  if "$(strip $(foreach inc,$(VBOX_LINUX_INCS),$(wildcard $(inc)/drm/drmP.h)))" != ""
-   SYSMODS += vboxvideo_drm
-  endif
- else
-  if "$(shell grep -s 'DRM_IOCTL_MODE_CURSOR2' $(foreach inc,$(VBOX_LINUX_INCS),$(inc)/uapi/drm/drm.h))" != ""
-   SYSMODS += vboxvideo_drm
-  endif
+ if "$(shell grep -s 'DRM_IOCTL_MODE_CURSOR2' $(foreach inc,$(VBOX_LINUX_INCS),$(inc)/uapi/drm/drm.h))" != ""
+  SYSMODS += vboxvideo_drm
  endif
 endif
@@ -63 +51 @@
         KBUILD_BASENAME=KBUILD_STR\(vboxvideo\) \
         DEBUG_HASH=2 DEBUG_HASH2=3
-if !defined(VBOX_WITH_GUEST_KMS_DRIVER)
- vboxvideo_drm_SOURCES         = vboxvideo_drm.c
-else
- vboxvideo_drm_INCS           += \
-   ../../../Runtime/include \
-   ../../../Runtime/r0drv/linux
- vboxvideo_drm_SOURCES         = \
-   ../../common/VBoxVideo/HGSMIBase.cpp \
-   ../../common/VBoxVideo/Modesetting.cpp \
-   ../../common/VBoxVideo/VBVABase.cpp \
-   ../../../GuestHost/HGSMI/HGSMICommon.cpp \
-   ../../../GuestHost/HGSMI/HGSMIMemAlloc.cpp \
-   ../../../Runtime/common/alloc/heapoffset.cpp \
-        vbox_drv.c \
-        vbox_fb.c \
-        vbox_irq.c \
-        vbox_main.c \
-        vbox_mode.c \
-        vbox_ttm.c
-endif
+vboxvideo_drm_INCS           += \
+  ../../../Runtime/include \
+  ../../../Runtime/r0drv/linux
+vboxvideo_drm_SOURCES         = \
+  ../../common/VBoxVideo/HGSMIBase.cpp \
+  ../../common/VBoxVideo/Modesetting.cpp \
+  ../../common/VBoxVideo/VBVABase.cpp \
+  ../../../GuestHost/HGSMI/HGSMICommon.cpp \
+  ../../../GuestHost/HGSMI/HGSMIMemAlloc.cpp \
+  ../../../Runtime/common/alloc/heapoffset.cpp \
+        vbox_drv.c \
+        vbox_fb.c \
+        vbox_irq.c \
+        vbox_main.c \
+        vbox_mode.c \
+        vbox_ttm.c
 
 include $(FILE_KBUILD_SUB_FOOTER)