Commit 2695eae1 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/vboxvideo: Switch to generic fbdev emulation 



There's nothing special about vboxvideo's fbdev emulation that is
not provided by the generic implementation. Switch over and remove
the driver's code.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191011134808.3955-2-tzimmermann@suse.de
parent 1ccd5417

drivers/gpu/drm/vboxvideo/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

vboxvideo-y :=  hgsmi_base.o modesetting.o vbva_base.o \

		vbox_drv.o vbox_fb.o vbox_hgsmi.o vbox_irq.o vbox_main.o \

		vbox_drv.o vbox_hgsmi.o vbox_irq.o vbox_main.o \

		vbox_mode.o vbox_ttm.o



obj-$(CONFIG_DRM_VBOXVIDEO) += vboxvideo.o

drivers/gpu/drm/vboxvideo/vbox_drv.c

+3 −11
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include <drm/drm_crtc_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_file.h>

#include <drm/drm_ioctl.h>
@@ -32,10 +33,6 @@ static const struct pci_device_id pciidlist[] = { 
};

MODULE_DEVICE_TABLE(pci, pciidlist);



static const struct drm_fb_helper_funcs vbox_fb_helper_funcs = {

	.fb_probe = vboxfb_create,

};



static int vbox_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	struct vbox_private *vbox;
@@ -79,20 +76,16 @@ static int vbox_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (ret)

		goto err_mode_fini;



	ret = drm_fb_helper_fbdev_setup(&vbox->ddev, &vbox->fb_helper,

					&vbox_fb_helper_funcs, 32,

					vbox->num_crtcs);

	ret = drm_fbdev_generic_setup(&vbox->ddev, 32);

	if (ret)

		goto err_irq_fini;



	ret = drm_dev_register(&vbox->ddev, 0);

	if (ret)

		goto err_fbdev_fini;

		goto err_irq_fini;



	return 0;



err_fbdev_fini:

	vbox_fbdev_fini(vbox);

err_irq_fini:

	vbox_irq_fini(vbox);

err_mode_fini:
@@ -113,7 +106,6 @@ static void vbox_pci_remove(struct pci_dev *pdev) 
	struct vbox_private *vbox = pci_get_drvdata(pdev);



	drm_dev_unregister(&vbox->ddev);

	vbox_fbdev_fini(vbox);

	vbox_irq_fini(vbox);

	vbox_mode_fini(vbox);

	vbox_mm_fini(vbox);

drivers/gpu/drm/vboxvideo/vbox_drv.h

+0 −7
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/string.h>



#include <drm/drm_encoder.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_gem.h>

#include <drm/drm_gem_vram_helper.h>
@@ -54,8 +53,6 @@ struct vbox_framebuffer { 
struct vbox_private {

	/* Must be first; or we must define our own release callback */

	struct drm_device ddev;

	struct drm_fb_helper fb_helper;

	struct vbox_framebuffer afb;



	u8 __iomem *guest_heap;

	u8 __iomem *vbva_buffers;
@@ -155,10 +152,6 @@ int vbox_framebuffer_init(struct vbox_private *vbox, 
			  const struct drm_mode_fb_cmd2 *mode_cmd,

			  struct drm_gem_object *obj);



int vboxfb_create(struct drm_fb_helper *helper,

		  struct drm_fb_helper_surface_size *sizes);

void vbox_fbdev_fini(struct vbox_private *vbox);



int vbox_mm_init(struct vbox_private *vbox);

void vbox_mm_fini(struct vbox_private *vbox);

drivers/gpu/drm/vboxvideo/vbox_fb.c

deleted100644 → 0
+0 −149
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

/*

 * Copyright (C) 2013-2017 Oracle Corporation

 * This file is based on ast_fb.c

 * Copyright 2012 Red Hat Inc.

 * Authors: Dave Airlie <airlied@redhat.com>

 *          Michael Thayer <michael.thayer@oracle.com,

 */

#include <linux/delay.h>

#include <linux/errno.h>

#include <linux/fb.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/mm.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/string.h>

#include <linux/sysrq.h>

#include <linux/tty.h>



#include <drm/drm_crtc.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_fourcc.h>



#include "vbox_drv.h"

#include "vboxvideo.h"



#ifdef CONFIG_DRM_KMS_FB_HELPER

static struct fb_deferred_io vbox_defio = {

	.delay = HZ / 30,

	.deferred_io = drm_fb_helper_deferred_io,

};

#endif



static struct fb_ops vboxfb_ops = {

	.owner = THIS_MODULE,

	DRM_FB_HELPER_DEFAULT_OPS,

	.fb_fillrect = drm_fb_helper_sys_fillrect,

	.fb_copyarea = drm_fb_helper_sys_copyarea,

	.fb_imageblit = drm_fb_helper_sys_imageblit,

};



int vboxfb_create(struct drm_fb_helper *helper,

		  struct drm_fb_helper_surface_size *sizes)

{

	struct vbox_private *vbox =

		container_of(helper, struct vbox_private, fb_helper);

	struct pci_dev *pdev = vbox->ddev.pdev;

	struct drm_mode_fb_cmd2 mode_cmd;

	struct drm_framebuffer *fb;

	struct fb_info *info;

	struct drm_gem_object *gobj;

	struct drm_gem_vram_object *gbo;

	int size, ret;

	s64 gpu_addr;

	u32 pitch;



	mode_cmd.width = sizes->surface_width;

	mode_cmd.height = sizes->surface_height;

	pitch = mode_cmd.width * ((sizes->surface_bpp + 7) / 8);

	mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,

							  sizes->surface_depth);

	mode_cmd.pitches[0] = pitch;



	size = pitch * mode_cmd.height;



	ret = vbox_gem_create(vbox, size, true, &gobj);

	if (ret) {

		DRM_ERROR("failed to create fbcon backing object %d\n", ret);

		return ret;

	}



	ret = vbox_framebuffer_init(vbox, &vbox->afb, &mode_cmd, gobj);

	if (ret)

		return ret;



	gbo = drm_gem_vram_of_gem(gobj);



	ret = drm_gem_vram_pin(gbo, DRM_GEM_VRAM_PL_FLAG_VRAM);

	if (ret)

		return ret;



	info = drm_fb_helper_alloc_fbi(helper);

	if (IS_ERR(info))

		return PTR_ERR(info);



	info->screen_size = size;

	info->screen_base = (char __iomem *)drm_gem_vram_kmap(gbo, true, NULL);

	if (IS_ERR(info->screen_base))

		return PTR_ERR(info->screen_base);



	fb = &vbox->afb.base;

	helper->fb = fb;



	info->fbops = &vboxfb_ops;



	/*

	 * This seems to be done for safety checking that the framebuffer

	 * is not registered twice by different drivers.

	 */

	info->apertures->ranges[0].base = pci_resource_start(pdev, 0);

	info->apertures->ranges[0].size = pci_resource_len(pdev, 0);



	drm_fb_helper_fill_info(info, helper, sizes);



	gpu_addr = drm_gem_vram_offset(gbo);

	if (gpu_addr < 0)

		return (int)gpu_addr;

	info->fix.smem_start = info->apertures->ranges[0].base + gpu_addr;

	info->fix.smem_len = vbox->available_vram_size - gpu_addr;



#ifdef CONFIG_DRM_KMS_FB_HELPER

	info->fbdefio = &vbox_defio;

	fb_deferred_io_init(info);

#endif



	info->pixmap.flags = FB_PIXMAP_SYSTEM;



	DRM_DEBUG_KMS("allocated %dx%d\n", fb->width, fb->height);



	return 0;

}



void vbox_fbdev_fini(struct vbox_private *vbox)

{

	struct vbox_framebuffer *afb = &vbox->afb;



#ifdef CONFIG_DRM_KMS_FB_HELPER

	if (vbox->fb_helper.fbdev && vbox->fb_helper.fbdev->fbdefio)

		fb_deferred_io_cleanup(vbox->fb_helper.fbdev);

#endif



	drm_fb_helper_unregister_fbi(&vbox->fb_helper);



	if (afb->obj) {

		struct drm_gem_vram_object *gbo = drm_gem_vram_of_gem(afb->obj);



		drm_gem_vram_kunmap(gbo);

		drm_gem_vram_unpin(gbo);



		drm_gem_object_put_unlocked(afb->obj);

		afb->obj = NULL;

	}

	drm_fb_helper_fini(&vbox->fb_helper);



	drm_framebuffer_unregister_private(&afb->base);

	drm_framebuffer_cleanup(&afb->base);

}

drivers/gpu/drm/vboxvideo/vbox_mode.c

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_plane_helper.h>

#include <drm/drm_probe_helper.h>
@@ -133,7 +134,7 @@ static bool vbox_set_up_input_mapping(struct vbox_private *vbox) 


		if (!fb1) {

			fb1 = fb;

			if (to_vbox_framebuffer(fb1) == &vbox->afb)

			if (fb1 == vbox->ddev.fb_helper->fb)

				break;

		} else if (fb != fb1) {

			single_framebuffer = false;

CRA Git | Maintained and supported by SUSTech CRA and CCSE