The vboxvideo driver has been converted to the atomic modesetting API
and all FIXME and TODO items have been fixed, so it is time to move it out
of staging.
Signed-off-by: Hans de Goede <hdego...@redhat.com>
---
drivers/gpu/drm/Kconfig | 2 ++
drivers/gpu/drm/Makefile | 1 +
drivers/{staging => gpu/drm}/vboxvideo/Kconfig | 0
drivers/{staging => gpu/drm}/vboxvideo/Makefile | 0
drivers/{staging => gpu/drm}/vboxvideo/hgsmi_base.c | 0
drivers/{staging => gpu/drm}/vboxvideo/hgsmi_ch_setup.h | 0
drivers/{staging => gpu/drm}/vboxvideo/hgsmi_channels.h | 0
drivers/{staging => gpu/drm}/vboxvideo/hgsmi_defs.h | 0
drivers/{staging => gpu/drm}/vboxvideo/modesetting.c | 0
drivers/{staging => gpu/drm}/vboxvideo/vbox_drv.c | 0
drivers/{staging => gpu/drm}/vboxvideo/vbox_drv.h | 0
drivers/{staging => gpu/drm}/vboxvideo/vbox_fb.c | 0
drivers/{staging => gpu/drm}/vboxvideo/vbox_hgsmi.c | 0
drivers/{staging => gpu/drm}/vboxvideo/vbox_irq.c | 0
drivers/{staging => gpu/drm}/vboxvideo/vbox_main.c | 0
drivers/{staging => gpu/drm}/vboxvideo/vbox_mode.c | 0
drivers/{staging => gpu/drm}/vboxvideo/vbox_prime.c | 0
drivers/{staging => gpu/drm}/vboxvideo/vbox_ttm.c | 0
drivers/{staging => gpu/drm}/vboxvideo/vboxvideo.h | 0
drivers/{staging => gpu/drm}/vboxvideo/vboxvideo_guest.h | 0
drivers/{staging => gpu/drm}/vboxvideo/vboxvideo_vbe.h | 0
drivers/{staging => gpu/drm}/vboxvideo/vbva_base.c | 0
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
drivers/staging/vboxvideo/TODO | 7 -------
25 files changed, 3 insertions(+), 10 deletions(-)
rename drivers/{staging => gpu/drm}/vboxvideo/Kconfig (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/Makefile (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/hgsmi_base.c (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/hgsmi_ch_setup.h (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/hgsmi_channels.h (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/hgsmi_defs.h (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/modesetting.c (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/vbox_drv.c (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/vbox_drv.h (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/vbox_fb.c (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/vbox_hgsmi.c (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/vbox_irq.c (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/vbox_main.c (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/vbox_mode.c (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/vbox_prime.c (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/vbox_ttm.c (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/vboxvideo.h (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/vboxvideo_guest.h (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/vboxvideo_vbe.h (100%)
rename drivers/{staging => gpu/drm}/vboxvideo/vbva_base.c (100%)
delete mode 100644 drivers/staging/vboxvideo/TODO
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 4385f00e1d05..2aa26dd23271 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -333,6 +333,8 @@ source "drivers/gpu/drm/tve200/Kconfig"
source "drivers/gpu/drm/xen/Kconfig"
+source "drivers/gpu/drm/vboxvideo/Kconfig"
+
# Keep legacy drivers last
menuconfig DRM_LEGACY
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index ce8d1d384319..4d3e101c9f9d 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -109,3 +109,4 @@ obj-$(CONFIG_DRM_TINYDRM) += tinydrm/
obj-$(CONFIG_DRM_PL111) += pl111/
obj-$(CONFIG_DRM_TVE200) += tve200/
obj-$(CONFIG_DRM_XEN) += xen/
+obj-$(CONFIG_DRM_VBOXVIDEO) += vboxvideo/
diff --git a/drivers/staging/vboxvideo/Kconfig
b/drivers/gpu/drm/vboxvideo/Kconfig
similarity index 100%
rename from drivers/staging/vboxvideo/Kconfig
rename to drivers/gpu/drm/vboxvideo/Kconfig
diff --git a/drivers/staging/vboxvideo/Makefile
b/drivers/gpu/drm/vboxvideo/Makefile
similarity index 100%
rename from drivers/staging/vboxvideo/Makefile
rename to drivers/gpu/drm/vboxvideo/Makefile
diff --git a/drivers/staging/vboxvideo/hgsmi_base.c
b/drivers/gpu/drm/vboxvideo/hgsmi_base.c
similarity index 100%
rename from drivers/staging/vboxvideo/hgsmi_base.c
rename to drivers/gpu/drm/vboxvideo/hgsmi_base.c
diff --git a/drivers/staging/vboxvideo/hgsmi_ch_setup.h
b/drivers/gpu/drm/vboxvideo/hgsmi_ch_setup.h
similarity index 100%
rename from drivers/staging/vboxvideo/hgsmi_ch_setup.h
rename to drivers/gpu/drm/vboxvideo/hgsmi_ch_setup.h
diff --git a/drivers/staging/vboxvideo/hgsmi_channels.h
b/drivers/gpu/drm/vboxvideo/hgsmi_channels.h
similarity index 100%
rename from drivers/staging/vboxvideo/hgsmi_channels.h
rename to drivers/gpu/drm/vboxvideo/hgsmi_channels.h
diff --git a/drivers/staging/vboxvideo/hgsmi_defs.h
b/drivers/gpu/drm/vboxvideo/hgsmi_defs.h
similarity index 100%
rename from drivers/staging/vboxvideo/hgsmi_defs.h
rename to drivers/gpu/drm/vboxvideo/hgsmi_defs.h
diff --git a/drivers/staging/vboxvideo/modesetting.c
b/drivers/gpu/drm/vboxvideo/modesetting.c
similarity index 100%
rename from drivers/staging/vboxvideo/modesetting.c
rename to drivers/gpu/drm/vboxvideo/modesetting.c
diff --git a/drivers/staging/vboxvideo/vbox_drv.c
b/drivers/gpu/drm/vboxvideo/vbox_drv.c
similarity index 100%
rename from drivers/staging/vboxvideo/vbox_drv.c
rename to drivers/gpu/drm/vboxvideo/vbox_drv.c
diff --git a/drivers/staging/vboxvideo/vbox_drv.h
b/drivers/gpu/drm/vboxvideo/vbox_drv.h
similarity index 100%
rename from drivers/staging/vboxvideo/vbox_drv.h
rename to drivers/gpu/drm/vboxvideo/vbox_drv.h
diff --git a/drivers/staging/vboxvideo/vbox_fb.c
b/drivers/gpu/drm/vboxvideo/vbox_fb.c
similarity index 100%
rename from drivers/staging/vboxvideo/vbox_fb.c
rename to drivers/gpu/drm/vboxvideo/vbox_fb.c
diff --git a/drivers/staging/vboxvideo/vbox_hgsmi.c
b/drivers/gpu/drm/vboxvideo/vbox_hgsmi.c
similarity index 100%
rename from drivers/staging/vboxvideo/vbox_hgsmi.c
rename to drivers/gpu/drm/vboxvideo/vbox_hgsmi.c
diff --git a/drivers/staging/vboxvideo/vbox_irq.c
b/drivers/gpu/drm/vboxvideo/vbox_irq.c
similarity index 100%
rename from drivers/staging/vboxvideo/vbox_irq.c
rename to drivers/gpu/drm/vboxvideo/vbox_irq.c
diff --git a/drivers/staging/vboxvideo/vbox_main.c
b/drivers/gpu/drm/vboxvideo/vbox_main.c
similarity index 100%
rename from drivers/staging/vboxvideo/vbox_main.c
rename to drivers/gpu/drm/vboxvideo/vbox_main.c
diff --git a/drivers/staging/vboxvideo/vbox_mode.c
b/drivers/gpu/drm/vboxvideo/vbox_mode.c
similarity index 100%
rename from drivers/staging/vboxvideo/vbox_mode.c
rename to drivers/gpu/drm/vboxvideo/vbox_mode.c
diff --git a/drivers/staging/vboxvideo/vbox_prime.c
b/drivers/gpu/drm/vboxvideo/vbox_prime.c
similarity index 100%
rename from drivers/staging/vboxvideo/vbox_prime.c
rename to drivers/gpu/drm/vboxvideo/vbox_prime.c
diff --git a/drivers/staging/vboxvideo/vbox_ttm.c
b/drivers/gpu/drm/vboxvideo/vbox_ttm.c
similarity index 100%
rename from drivers/staging/vboxvideo/vbox_ttm.c
rename to drivers/gpu/drm/vboxvideo/vbox_ttm.c
diff --git a/drivers/staging/vboxvideo/vboxvideo.h
b/drivers/gpu/drm/vboxvideo/vboxvideo.h
similarity index 100%
rename from drivers/staging/vboxvideo/vboxvideo.h
rename to drivers/gpu/drm/vboxvideo/vboxvideo.h
diff --git a/drivers/staging/vboxvideo/vboxvideo_guest.h
b/drivers/gpu/drm/vboxvideo/vboxvideo_guest.h
similarity index 100%
rename from drivers/staging/vboxvideo/vboxvideo_guest.h
rename to drivers/gpu/drm/vboxvideo/vboxvideo_guest.h
diff --git a/drivers/staging/vboxvideo/vboxvideo_vbe.h
b/drivers/gpu/drm/vboxvideo/vboxvideo_vbe.h
similarity index 100%
rename from drivers/staging/vboxvideo/vboxvideo_vbe.h
rename to drivers/gpu/drm/vboxvideo/vboxvideo_vbe.h
diff --git a/drivers/staging/vboxvideo/vbva_base.c
b/drivers/gpu/drm/vboxvideo/vbva_base.c
similarity index 100%
rename from drivers/staging/vboxvideo/vbva_base.c
rename to drivers/gpu/drm/vboxvideo/vbva_base.c
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index e4f608815c05..ba960e6cb62c 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -98,8 +98,6 @@ source "drivers/staging/greybus/Kconfig"
source "drivers/staging/vc04_services/Kconfig"
-source "drivers/staging/vboxvideo/Kconfig"
-
source "drivers/staging/pi433/Kconfig"
source "drivers/staging/mt7621-pci/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 5868631e8f1b..bb25cc11fc4a 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -39,7 +39,6 @@ obj-$(CONFIG_MOST) += most/
obj-$(CONFIG_KS7010) += ks7010/
obj-$(CONFIG_GREYBUS) += greybus/
obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/
-obj-$(CONFIG_DRM_VBOXVIDEO) += vboxvideo/
obj-$(CONFIG_PI433) += pi433/
obj-$(CONFIG_SOC_MT7621) += mt7621-pci/
obj-$(CONFIG_SOC_MT7621) += mt7621-pinctrl/
diff --git a/drivers/staging/vboxvideo/TODO b/drivers/staging/vboxvideo/TODO
deleted file mode 100644
index 2e0f99c3f10c..000000000000
--- a/drivers/staging/vboxvideo/TODO
+++ /dev/null
@@ -1,7 +0,0 @@
-TODO:
--Get a full review from the drm-maintainers on dri-devel done on this driver
--Extend this TODO with the results of that review
-
-Please send any patches to Greg Kroah-Hartman <gre...@linuxfoundation.org>,
-Hans de Goede <hdego...@redhat.com>, Michael Thayer <michael.tha...@oracle.com>
-and dri-devel@lists.freedesktop.org .
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
