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

Timestamp:

Jan 20, 2017 9:23:53 AM (8 years ago)

Author:

vboxsync

Message:

bugref:8282: Additions/linux: submit DRM driver to the Linux kernel: move all graphics device-related header files to a separate sub-directory and add that to the include path where they are needed. The intention is too be able to remove the VBox/ include folder in the DRM driver package.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• Makefile.kmk (modified) (1 diff)
• files_vboxvideo_drv (modified) (1 diff)
• vbox_drv.h (modified) (1 diff)
• vbox_fb.c (modified) (1 diff)
• vbox_irq.c (modified) (1 diff)
• vbox_main.c (modified) (1 diff)
• vbox_mode.c (modified) (1 diff)

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

@@ -53 +53 @@
 vboxvideo_drm_INCS           += \
   ../../../Runtime/include \
-  ../../../Runtime/r0drv/linux
+  ../../../Runtime/r0drv/linux \
+  $(VBOX_GRAPHICS_INCS)
 vboxvideo_drm_SOURCES         = \
   ../../common/VBoxVideo/HGSMIBase.cpp \

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

@@ -36 +36 @@
     ${PATH_ROOT}/include/VBox/err.h=>include/VBox/err.h \
     ${PATH_ROOT}/include/VBox/types.h=>include/VBox/types.h \
-    ${PATH_ROOT}/include/VBox/VBoxVideo.h=>include/VBox/VBoxVideo.h \
-    ${PATH_ROOT}/include/VBox/VBoxVideoGuest.h=>include/VBox/VBoxVideoGuest.h \
-    ${PATH_ROOT}/include/VBox/HGSMI/HGSMI.h=>include/VBox/HGSMI/HGSMI.h \
-    ${PATH_ROOT}/include/VBox/HGSMI/HGSMIChannels.h=>include/VBox/HGSMI/HGSMIChannels.h \
-    ${PATH_ROOT}/include/VBox/HGSMI/HGSMIChSetup.h=>include/VBox/HGSMI/HGSMIChSetup.h \
-    ${PATH_ROOT}/include/VBox/HGSMI/HGSMIDefs.h=>include/VBox/HGSMI/HGSMIDefs.h \
-    ${PATH_ROOT}/include/VBox/HGSMI/HGSMIMemAlloc.h=>include/VBox/HGSMI/HGSMIMemAlloc.h \
-    ${PATH_ROOT}/include/VBox/Hardware/VBoxVideoVBE.h=>include/VBox/Hardware/VBoxVideoVBE.h \
+    ${PATH_ROOT}/include/VBox/Graphics/VBoxVideo.h=>include/VBoxVideo.h \
+    ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoGuest.h=>include/VBoxVideoGuest.h \
+    ${PATH_ROOT}/include/VBox/Graphics/HGSMI.h=>include/HGSMI.h \
+    ${PATH_ROOT}/include/VBox/Graphics/HGSMIChannels.h=>include/HGSMIChannels.h \
+    ${PATH_ROOT}/include/VBox/Graphics/HGSMIChSetup.h=>include/HGSMIChSetup.h \
+    ${PATH_ROOT}/include/VBox/Graphics/HGSMIDefs.h=>include/HGSMIDefs.h \
+    ${PATH_ROOT}/include/VBox/Graphics/HGSMIMemAlloc.h=>include/HGSMIMemAlloc.h \
+    ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoVBE.h=>include/VBoxVideoVBE.h \
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp=>HGSMIBase.c \
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp=>Modesetting.c \

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

@@ -51 +51 @@
 #define LOG_GROUP LOG_GROUP_DEV_VGA
 
-#include <VBox/VBoxVideoGuest.h>
+#include <VBoxVideoGuest.h>
 
 #include <drm/drmP.h>

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

@@ -48 +48 @@
 /* Include from most specific to most general to be able to override things. */
 #include "vbox_drv.h"
-#include <VBox/VBoxVideo.h>
+#include <VBoxVideo.h>
 
 #include <linux/module.h>

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

@@ -46 +46 @@
 #include "vbox_drv.h"
 
-#include <VBox/VBoxVideo.h>
+#include <VBoxVideo.h>
 
 #include <drm/drm_crtc_helper.h>

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

@@ -48 +48 @@
 #include "vbox_drv.h"
 
-#include <VBox/VBoxVideoGuest.h>
-#include <VBox/VBoxVideo.h>
+#include <VBoxVideoGuest.h>
+#include <VBoxVideoVBE.h>
 
 #include <drm/drm_fb_helper.h>

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

@@ -50 +50 @@
 #include "vbox_drv.h"
 
-#include <VBox/VBoxVideo.h>
+#include <VBoxVideo.h>
 
 #include <linux/export.h>