Changeset 48364 in vbox for trunk/src/VBox

Timestamp:

Sep 6, 2013 3:49:03 PM (11 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: move files and updates.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• Makefile.kmk (modified) (1 diff)
• Makefile.module.kms (modified) (1 diff)
• files_vboxvideo_drv (modified) (1 diff)
• vbox_drv.c (copied) (copied from trunk/src/VBox/Additions/linux/drm2/vbox_drv.c ) (2 diffs)
• vbox_drv.h (copied) (copied from trunk/src/VBox/Additions/linux/drm2/vbox_drv.h ) (4 diffs)
• vboxvideo.h (deleted)
• vboxvideo_crtc.c (deleted)
• vboxvideo_dac.c (deleted)
• vboxvideo_device.c (deleted)
• vboxvideo_display.c (deleted)
• vboxvideo_drv.c (deleted)
• vboxvideo_drv.h (deleted)
• vboxvideo_fbdev.c (deleted)
• vboxvideo_framebuffer.c (deleted)
• vboxvideo_kms.c (deleted)
• vboxvideo_mode.h (deleted)
• vboxvideo_vga.c (deleted)

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

@@ -79 +79 @@
  vboxvideo_drm_INCS           += ../../../Runtime/r0drv/linux
  vboxvideo_drm_SOURCES         = \
+   ../../common/VBoxVideo/HGSMIBase.cpp \
    ../../common/VBoxVideo/Modesetting.cpp \
-        vboxvideo_crtc.c \
-        vboxvideo_dac.c \
-        vboxvideo_device.c \
-        vboxvideo_display.c \
-        vboxvideo_drv.c \
-        vboxvideo_fbdev.c \
-        vboxvideo_framebuffer.c \
-        vboxvideo_kms.c \
-        vboxvideo_vga.c
+   ../../common/VBoxVideo/VBVABase.cpp \
+        vbox_drv.c \
+        vbox_fb.c \
+        vbox_main.c \
+        vbox_mode.c \
+        vbox_ttm.c
 endif
 

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

@@ -21 +21 @@
 MOD_NAME   = vboxvideo
 
-MOD_OBJS   = Modesetting.o vboxvideo_crtc.o vboxvideo_dac.o vboxvideo_device.o \
-             vboxvideo_display.o vboxvideo_drv.o vboxvideo_fbdev.o \
-             vboxvideo_framebuffer.o vboxvideo_kms.o vboxvideo_vga.o
+MOD_OBJS   = HGSMIBase.o Modesetting.o VBVABase.o vbox_drv.o vbox_fb.o \
+             vbox_main.o vbox_mode.o vbox_ttm.o 
 
 ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxvideo),)

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

@@ -47 +47 @@
     ${PATH_ROOT}/include/VBox/HGSMI/HGSMIChSetup.h=>include/VBox/HGSMI/HGSMIChSetup.h \
     ${PATH_ROOT}/include/VBox/Hardware/VBoxVideoVBE.h=>include/VBox/Hardware/VBoxVideoVBE.h \
+    ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp=>HGSMIBase.c \
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp=>Modesetting.c \
-    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo.h=>vboxvideo.h \
-    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_crtc.c=>vboxvideo_crtc.c \
-    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_dac.c=>vboxvideo_dac.c \
-    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_device.c=>vboxvideo_device.c \
-    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_display.c=>vboxvideo_display.c \
-    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_drv.c=>vboxvideo_drv.c \
-    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_drv.h=>vboxvideo_drv.h \
-    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_fbdev.c=>vboxvideo_fbdev.c \
-    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_framebuffer.c=>vboxvideo_framebuffer.c \
-    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_kms.c=>vboxvideo_kms.c \
-    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_mode.h=>vboxvideo_mode.h \
-    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_vga.c=>vboxvideo_vga.c \
+    ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp=>VBVABase.c \
+    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_drv.c=>vbox_drv.c \
+    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_drv.h=>vbox_drv.h \
+    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_fb.c=>vbox_fb.c \
+    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_main.c=>vbox_main.c \
+    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_mode.c=>vbox_mode.c \
+    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_ttm.c=>vbox_ttm.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h=>r0drv/linux/the-linux-kernel.h \
     ${PATH_ROOT}/src/VBox/Installer/linux/Makefile.include.header=>Makefile.include.header \

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

@@ -46 +46 @@
  * Authors: Dave Airlie <[email protected]>
  */
+#include "vbox_drv.h"
+
 #include <linux/module.h>
 #include <linux/console.h>
@@ -51 +53 @@
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
-
-#include "vbox_drv.h"
 
 int vbox_modeset = -1;

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

@@ -3 +3 @@
  * VirtualBox Additions Linux kernel video driver
  */
-q
+
 /*
  * Copyright (C) 2013 Oracle Corporation
@@ -49 +49 @@
 #define __VBOX_DRV_H__
 
+#include <VBox/VBoxVideoGuest.h>
+
+#include "the-linux-kernel.h"
+
+#include <drm/drmP.h>
 #include <drm/drm_fb_helper.h>
 
@@ -57 +62 @@
 #include <drm/ttm/ttm_module.h>
 
-#include "vboxvideo.h"
+/* #include "vboxvideo.h" */
 
 #include "product-generated.h"
@@ -111 +116 @@
         struct drm_crtc base;
         bool fBlanked;
+        unsigned crtc_id;
         struct drm_gem_object *cursor_bo;
         uint64_t cursor_addr;