drm/bochs: Move to tiny/ and simplify
Subsystems (4)
Thomas Zimmermann
maintainerv2 cover drm/bochs: Move to tiny/ and simplify
Move the bochs driver to tiny/ and simplify the clean-up code. Also update GEM VRAM helpers accordingly.
v2:
* make bochs_mode_funcs static (Daniel, kernel test robot)
Thomas Zimmermann (3):
drm/bochs: Move to tiny/
drm/bochs: Use managed initialization for GEM VRAM helpers drm/vram-helper: Unexport drm_vram_helper_{alloc,release}_mm()
MAINTAINERS | 2 +- drivers/gpu/drm/Kconfig | 2 - drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/bochs/Kconfig | 11 - drivers/gpu/drm/bochs/Makefile | 4 - drivers/gpu/drm/bochs/bochs.h | 98 ---- drivers/gpu/drm/bochs/bochs_drv.c | 205 ------- drivers/gpu/drm/bochs/bochs_hw.c | 323 ------------ drivers/gpu/drm/bochs/bochs_kms.c | 178 ------- drivers/gpu/drm/bochs/bochs_mm.c | 24 - drivers/gpu/drm/drm_gem_vram_helper.c | 9 +- drivers/gpu/drm/tiny/Kconfig | 13 + drivers/gpu/drm/tiny/Makefile | 1 + drivers/gpu/drm/tiny/bochs.c | 733 ++++++++++++++++++++++++++ include/drm/drm_gem_vram_helper.h | 4 - 15 files changed, 751 insertions(+), 857 deletions(-) delete mode 100644 drivers/gpu/drm/bochs/Kconfig delete mode 100644 drivers/gpu/drm/bochs/Makefile delete mode 100644 drivers/gpu/drm/bochs/bochs.h delete mode 100644 drivers/gpu/drm/bochs/bochs_drv.c delete mode 100644 drivers/gpu/drm/bochs/bochs_hw.c delete mode 100644 drivers/gpu/drm/bochs/bochs_kms.c delete mode 100644 drivers/gpu/drm/bochs/bochs_mm.c create mode 100644 drivers/gpu/drm/tiny/bochs.c
--
2.32.0
Thomas Zimmermann
maintainerPATCH v2 1/3 drm/bochs: Move to tiny/
The bochs driver is only ~600 lines of code. Putting it into tiny/ cleans up the DRM directory slightly. Some style problems were fixed and unneeded include statements were removed. No functional changes.
v2:
* make bochs_mode_funcs static (Daniel, kernel test robot)
* rebase onto aperture API changes
--- MAINTAINERS | 2 +- drivers/gpu/drm/Kconfig | 2 - drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/bochs/Kconfig | 11 - drivers/gpu/drm/bochs/Makefile | 4 - drivers/gpu/drm/bochs/bochs.h | 98 ---- drivers/gpu/drm/bochs/bochs_drv.c | 205 -------- drivers/gpu/drm/bochs/bochs_hw.c | 323 ------------- drivers/gpu/drm/bochs/bochs_kms.c | 178 ------- drivers/gpu/drm/bochs/bochs_mm.c | 24 - drivers/gpu/drm/tiny/Kconfig | 13 + drivers/gpu/drm/tiny/Makefile | 1 + drivers/gpu/drm/tiny/bochs.c | 766 ++++++++++++++++++++++++++++++ 13 files changed, 781 insertions(+), 847 deletions(-) delete mode 100644 drivers/gpu/drm/bochs/Kconfig delete mode 100644 drivers/gpu/drm/bochs/Makefile delete mode 100644 drivers/gpu/drm/bochs/bochs.h delete mode 100644 drivers/gpu/drm/bochs/bochs_drv.c delete mode 100644 drivers/gpu/drm/bochs/bochs_hw.c delete mode 100644 drivers/gpu/drm/bochs/bochs_kms.c delete mode 100644 drivers/gpu/drm/bochs/bochs_mm.c create mode 100644 drivers/gpu/drm/tiny/bochs.c
MAINTAINERS +1 -1
@@ -5680,7 +5680,7 @@ M: Gerd Hoffmann <[email protected]> L: [email protected] S: Maintained T: git git://anongit.freedesktop.org/drm/drm-misc -F: drivers/gpu/drm/bochs/ +F: drivers/gpu/drm/tiny/bochs.c DRM DRIVER FOR BOE HIMAX8279D PANELS M: Jerry Han <[email protected]>
drivers/gpu/drm/Kconfig +0 -2
@@ -322,8 +322,6 @@ source "drivers/gpu/drm/tilcdc/Kconfig" source "drivers/gpu/drm/qxl/Kconfig" -source "drivers/gpu/drm/bochs/Kconfig" - source "drivers/gpu/drm/virtio/Kconfig" source "drivers/gpu/drm/msm/Kconfig"
drivers/gpu/drm/Makefile +0 -1
@@ -98,7 +98,6 @@ obj-y += omapdrm/ obj-$(CONFIG_DRM_SUN4I) += sun4i/ obj-y += tilcdc/ obj-$(CONFIG_DRM_QXL) += qxl/ -obj-$(CONFIG_DRM_BOCHS) += bochs/ obj-$(CONFIG_DRM_VIRTIO_GPU) += virtio/ obj-$(CONFIG_DRM_MSM) += msm/ obj-$(CONFIG_DRM_TEGRA) += tegra/
drivers/gpu/drm/bochs/Kconfig deleted +0 -11
@@ -1,11 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -config DRM_BOCHS - tristate "DRM Support for bochs dispi vga interface (qemu stdvga)" - depends on DRM && PCI && MMU - select DRM_KMS_HELPER - select DRM_VRAM_HELPER - select DRM_TTM - select DRM_TTM_HELPER - help - Choose this option for qemu. - If M is selected the module will be called bochs-drm.
drivers/gpu/drm/bochs/Makefile deleted +0 -4
@@ -1,4 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -bochs-drm-y := bochs_drv.o bochs_mm.o bochs_kms.o bochs_hw.o - -obj-$(CONFIG_DRM_BOCHS) += bochs-drm.o
drivers/gpu/drm/bochs/bochs.h deleted +0 -98
98 lines not on this page · raw message
drivers/gpu/drm/bochs/bochs_drv.c deleted +0 -205
205 lines not on this page · raw message
drivers/gpu/drm/bochs/bochs_hw.c deleted +0 -323
323 lines not on this page · raw message
drivers/gpu/drm/bochs/bochs_kms.c deleted +0 -178
178 lines not on this page · raw message
drivers/gpu/drm/bochs/bochs_mm.c deleted +0 -24
@@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* -*/ - -#include "bochs.h" - -/* ---------------------------------------------------------------------- */ - -int bochs_mm_init (struct bochs_device *bochs) -{ -struct drm_vram_mm *vmm; - - vmm =drm_vram_helper_alloc_mm (bochs->dev, bochs->fb_base, - bochs->fb_size); -return PTR_ERR_OR_ZERO (vmm); -} - -void bochs_mm_fini (struct bochs_device *bochs) -{ -if (!bochs->dev->vram_mm) -return ; - -drm_vram_helper_release_mm (bochs->dev); -}
drivers/gpu/drm/tiny/Kconfig +13 -0
@@ -10,6 +10,19 @@ config DRM_ARCPGU If M is selected the module will be called arcpgu. +config DRM_BOCHS + tristate "DRM Support for bochs dispi vga interface (qemu stdvga)" + depends on DRM && PCI && MMU + select DRM_KMS_HELPER + select DRM_VRAM_HELPER + select DRM_TTM + select DRM_TTM_HELPER + help + This is a KMS driver for qemu's stdvga output. Choose this option + for qemu. + + If M is selected the module will be called bochs. + config DRM_CIRRUS_QEMU tristate "Cirrus driver for QEMU emulated device" depends on DRM && PCI && MMU
drivers/gpu/drm/tiny/Makefile +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_DRM_ARCPGU) += arcpgu.o +obj-$(CONFIG_DRM_BOCHS) += bochs.o obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus.o obj-$(CONFIG_DRM_GM12U320) += gm12u320.o obj-$(CONFIG_DRM_SIMPLEDRM) += simpledrm.o
drivers/gpu/drm/tiny/bochs.c new file +766 -0
766 lines not on this page · raw message
Signature · 1 line
2.32.0
Thomas Zimmermann
maintainerPATCH v2 2/3 drm/bochs: Use managed initialization for GEM VRAM helpers
In reply to Thomas ZimmermannConvert to managed GEM VRAM initialization and switch bochs to full autocleanup.
--- drivers/gpu/drm/tiny/bochs.c | 43 +++++------------------------------- 1 file changed, 5 insertions(+), 38 deletions(-)
drivers/gpu/drm/tiny/bochs.c +5 -38
@@ -404,25 +404,6 @@ static void bochs_hw_setbase(struct bochs_device *bochs, int x, int y, int strid/* ---------------------------------------------------------------------- */ -static int bochs_mm_init (struct bochs_device *bochs) -{ -struct drm_vram_mm *vmm; - - vmm =drm_vram_helper_alloc_mm (bochs->dev, bochs->fb_base, - bochs->fb_size); -return PTR_ERR_OR_ZERO (vmm); -} - -static void bochs_mm_fini (struct bochs_device *bochs) -{ -if (!bochs->dev->vram_mm) -return ; - -drm_vram_helper_release_mm (bochs->dev); -} - -/* ---------------------------------------------------------------------- */ -static const uint32_t bochs_formats[] = {DRM_FORMAT_XRGB8888 ,DRM_FORMAT_BGRX8888 ,
@@ -581,13 +562,6 @@ static int bochs_kms_init(struct bochs_device *bochs)/* ---------------------------------------------------------------------- */ /* drm interface */ -static void bochs_unload (struct drm_device *dev) -{ -struct bochs_device *bochs = dev->dev_private; - -bochs_mm_fini (bochs); -} -static int bochs_load (struct drm_device *dev) {struct bochs_device *bochs;
@@ -601,21 +575,17 @@ static int bochs_load(struct drm_device *dev) ret =bochs_hw_init (dev);if (ret) - goto err; +return ret; - ret =bochs_mm_init (bochs); + ret =drmm_vram_helper_init (dev, bochs->fb_base, bochs->fb_size);if (ret) - goto err; +return ret; ret =bochs_kms_init (bochs);if (ret) - goto err; +return ret;return 0 ; - -err: -bochs_unload (dev); -return ret; }DEFINE_DRM_GEM_FOPS (bochs_fops);
@@ -629,7 +599,6 @@ static const struct drm_driver bochs_driver = { .major = 1, .minor = 0, DRM_GEM_VRAM_DRIVER, - .release = bochs_unload, };/* ---------------------------------------------------------------------- */
@@ -691,13 +660,11 @@ static int bochs_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent ret =drm_dev_register (dev,0 );if (ret) - goto err_unload; + goto err_free_dev;drm_fbdev_generic_setup (dev,32 );return ret; -err_unload: -bochs_unload (dev); err_free_dev:drm_dev_put (dev);return ret;
Signature · 1 line
2.32.0
Thomas Zimmermann
maintainerPATCH v2 3/3 drm/vram-helper: Unexport drm_vram_helper_{alloc, release}_mm()
In reply to Thomas ZimmermannAll GEM-VRAM-based drivers use auto-cleanup via drmm_vram_helper_init(). Unexport the manual APIs and make them internal implementation.
--- drivers/gpu/drm/drm_gem_vram_helper.c | 9 +++------ include/drm/drm_gem_vram_helper.h | 4 ---- 2 files changed, 3 insertions(+), 10 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +3 -6
@@ -1012,9 +1012,8 @@ static void drm_vram_mm_cleanup(struct drm_vram_mm *vmm)* Helpers for integration with struct drm_device */ -/* deprecated; use drmm_vram_mm_init() */ -struct drm_vram_mm *drm_vram_helper_alloc_mm ( -struct drm_device *dev,uint64_t vram_base,size_t vram_size) +static struct drm_vram_mm *drm_vram_helper_alloc_mm (struct drm_device *dev,uint64_t vram_base, +size_t vram_size) {int ret;
@@ -1036,9 +1035,8 @@ struct drm_vram_mm *drm_vram_helper_alloc_mm( dev->vram_mm =NULL ;return ERR_PTR (ret); } -EXPORT_SYMBOL (drm_vram_helper_alloc_mm); -void drm_vram_helper_release_mm (struct drm_device *dev) +static void drm_vram_helper_release_mm (struct drm_device *dev) {if (!dev->vram_mm)return ;
@@ -1047,7 +1045,6 @@ void drm_vram_helper_release_mm(struct drm_device *dev)kfree (dev->vram_mm); dev->vram_mm =NULL ; } -EXPORT_SYMBOL (drm_vram_helper_release_mm);static void drm_vram_mm_release (struct drm_device *dev,void *ptr) {
include/drm/drm_gem_vram_helper.h +0 -4
@@ -204,10 +204,6 @@ void drm_vram_mm_debugfs_init(struct drm_minor *minor);* Helpers for integration with struct drm_device */ -struct drm_vram_mm *drm_vram_helper_alloc_mm ( -struct drm_device *dev,uint64_t vram_base,size_t vram_size); -void drm_vram_helper_release_mm (struct drm_device *dev); -int drmm_vram_helper_init (struct drm_device *dev,uint64_t vram_base,size_t vram_size);
Signature · 1 line
2.32.0