drm/vboxvideo: Move the vboxvideo driver out of staging

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. Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190304164724.10210-4-hdegoede@redhat.com
mariux64 · Mar 11, 2019 · 131abc5 · 131abc5
1 parent e5361b4
commit 131abc5
Showing 25 changed files with 3 additions and 10 deletions.
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
@@ -329,6 +329,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
@@ -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 → drivers/gpu/drm/vboxvideo/Kconfig b/drivers/staging/vboxvideo/Kconfig → drivers/gpu/drm/vboxvideo/Kconfig
diff --git a/drivers/staging/vboxvideo/Makefile → drivers/gpu/drm/vboxvideo/Makefile b/drivers/staging/vboxvideo/Makefile → drivers/gpu/drm/vboxvideo/Makefile
diff --git a/drivers/staging/vboxvideo/hgsmi_base.c → drivers/gpu/drm/vboxvideo/hgsmi_base.c b/drivers/staging/vboxvideo/hgsmi_base.c → drivers/gpu/drm/vboxvideo/hgsmi_base.c
diff --git a/drivers/staging/vboxvideo/hgsmi_ch_setup.h → drivers/gpu/drm/vboxvideo/hgsmi_ch_setup.h b/drivers/staging/vboxvideo/hgsmi_ch_setup.h → drivers/gpu/drm/vboxvideo/hgsmi_ch_setup.h
diff --git a/drivers/staging/vboxvideo/hgsmi_channels.h → drivers/gpu/drm/vboxvideo/hgsmi_channels.h b/drivers/staging/vboxvideo/hgsmi_channels.h → drivers/gpu/drm/vboxvideo/hgsmi_channels.h
diff --git a/drivers/staging/vboxvideo/hgsmi_defs.h → drivers/gpu/drm/vboxvideo/hgsmi_defs.h b/drivers/staging/vboxvideo/hgsmi_defs.h → drivers/gpu/drm/vboxvideo/hgsmi_defs.h
diff --git a/drivers/staging/vboxvideo/modesetting.c → drivers/gpu/drm/vboxvideo/modesetting.c b/drivers/staging/vboxvideo/modesetting.c → drivers/gpu/drm/vboxvideo/modesetting.c
diff --git a/drivers/staging/vboxvideo/vbox_drv.c → drivers/gpu/drm/vboxvideo/vbox_drv.c b/drivers/staging/vboxvideo/vbox_drv.c → drivers/gpu/drm/vboxvideo/vbox_drv.c
diff --git a/drivers/staging/vboxvideo/vbox_drv.h → drivers/gpu/drm/vboxvideo/vbox_drv.h b/drivers/staging/vboxvideo/vbox_drv.h → drivers/gpu/drm/vboxvideo/vbox_drv.h
diff --git a/drivers/staging/vboxvideo/vbox_fb.c → drivers/gpu/drm/vboxvideo/vbox_fb.c b/drivers/staging/vboxvideo/vbox_fb.c → drivers/gpu/drm/vboxvideo/vbox_fb.c
diff --git a/drivers/staging/vboxvideo/vbox_hgsmi.c → drivers/gpu/drm/vboxvideo/vbox_hgsmi.c b/drivers/staging/vboxvideo/vbox_hgsmi.c → drivers/gpu/drm/vboxvideo/vbox_hgsmi.c
diff --git a/drivers/staging/vboxvideo/vbox_irq.c → drivers/gpu/drm/vboxvideo/vbox_irq.c b/drivers/staging/vboxvideo/vbox_irq.c → drivers/gpu/drm/vboxvideo/vbox_irq.c
diff --git a/drivers/staging/vboxvideo/vbox_main.c → drivers/gpu/drm/vboxvideo/vbox_main.c b/drivers/staging/vboxvideo/vbox_main.c → drivers/gpu/drm/vboxvideo/vbox_main.c
diff --git a/drivers/staging/vboxvideo/vbox_mode.c → drivers/gpu/drm/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c → drivers/gpu/drm/vboxvideo/vbox_mode.c
diff --git a/drivers/staging/vboxvideo/vbox_prime.c → drivers/gpu/drm/vboxvideo/vbox_prime.c b/drivers/staging/vboxvideo/vbox_prime.c → drivers/gpu/drm/vboxvideo/vbox_prime.c
diff --git a/drivers/staging/vboxvideo/vbox_ttm.c → drivers/gpu/drm/vboxvideo/vbox_ttm.c b/drivers/staging/vboxvideo/vbox_ttm.c → drivers/gpu/drm/vboxvideo/vbox_ttm.c
diff --git a/drivers/staging/vboxvideo/vboxvideo.h → drivers/gpu/drm/vboxvideo/vboxvideo.h b/drivers/staging/vboxvideo/vboxvideo.h → drivers/gpu/drm/vboxvideo/vboxvideo.h
diff --git a/drivers/staging/vboxvideo/vboxvideo_guest.h → drivers/gpu/drm/vboxvideo/vboxvideo_guest.h b/drivers/staging/vboxvideo/vboxvideo_guest.h → drivers/gpu/drm/vboxvideo/vboxvideo_guest.h
diff --git a/drivers/staging/vboxvideo/vboxvideo_vbe.h → drivers/gpu/drm/vboxvideo/vboxvideo_vbe.h b/drivers/staging/vboxvideo/vboxvideo_vbe.h → drivers/gpu/drm/vboxvideo/vboxvideo_vbe.h
diff --git a/drivers/staging/vboxvideo/vbva_base.c → drivers/gpu/drm/vboxvideo/vbva_base.c b/drivers/staging/vboxvideo/vbva_base.c → drivers/gpu/drm/vboxvideo/vbva_base.c
diff --git 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
@@ -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