Commit b3a25b9a authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Gerd Hoffmann
Browse files

drm/bochs: Convert bochs driver to VRAM MM 



The data structure |struct drm_vram_mm| and its helpers replace bochs'
TTM-based memory manager. It's the same implementation; except for the
type names.

v5:
	* set .llseek via DRM_VRAM_MM_FILE_OPERATIONS
v4:
	* don't select DRM_TTM or DRM_VRAM_MM_HELPER
v3:
	* use drm_gem_vram_mm_funcs
	* convert driver to drm_device-based instance
v2:
	* implement bochs_mmap() with drm_vram_mm_mmap()

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: http://patchwork.freedesktop.org/patch/msgid/20190508082630.15116-14-tzimmermann@suse.de


Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent a3232987

drivers/gpu/drm/bochs/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ config DRM_BOCHS 
	tristate "DRM Support for bochs dispi vga interface (qemu stdvga)"

	depends on DRM && PCI && MMU

	select DRM_KMS_HELPER

	select DRM_TTM

	select DRM_VRAM_HELPER

	help

	  Choose this option for qemu.

drivers/gpu/drm/bochs/bochs.h

+1 −12
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ 
#include <drm/drm_gem.h>

#include <drm/drm_gem_vram_helper.h>



#include <drm/ttm/ttm_bo_driver.h>

#include <drm/ttm/ttm_page_alloc.h>

#include <drm/drm_vram_mm_helper.h>



/* ---------------------------------------------------------------------- */
@@ -74,12 +73,6 @@ struct bochs_device { 
	struct drm_device *dev;

	struct drm_simple_display_pipe pipe;

	struct drm_connector connector;



	/* ttm */

	struct {

		struct ttm_bo_device bdev;

		bool initialized;

	} ttm;

};



/* ---------------------------------------------------------------------- */
@@ -99,10 +92,6 @@ int bochs_hw_load_edid(struct bochs_device *bochs); 
/* bochs_mm.c */

int bochs_mm_init(struct bochs_device *bochs);

void bochs_mm_fini(struct bochs_device *bochs);

int bochs_mmap(struct file *filp, struct vm_area_struct *vma);



int bochs_dumb_create(struct drm_file *file, struct drm_device *dev,

		      struct drm_mode_create_dumb *args);



/* bochs_kms.c */

int bochs_kms_init(struct bochs_device *bochs);

drivers/gpu/drm/bochs/bochs_drv.c

+2 −13
Original line number Diff line number Diff line
@@ -63,14 +63,7 @@ err: 


static const struct file_operations bochs_fops = {

	.owner		= THIS_MODULE,

	.open		= drm_open,

	.release	= drm_release,

	.unlocked_ioctl	= drm_ioctl,

	.compat_ioctl	= drm_compat_ioctl,

	.poll		= drm_poll,

	.read		= drm_read,

	.llseek		= no_llseek,

	.mmap           = bochs_mmap,

	DRM_VRAM_MM_FILE_OPERATIONS

};



static struct drm_driver bochs_driver = {
@@ -82,11 +75,7 @@ static struct drm_driver bochs_driver = { 
	.date			= "20130925",

	.major			= 1,

	.minor			= 0,

	.gem_free_object_unlocked =

		drm_gem_vram_driver_gem_free_object_unlocked,

	.dumb_create            = bochs_dumb_create,

	.dumb_map_offset        = drm_gem_vram_driver_dumb_mmap_offset,



	DRM_GEM_VRAM_DRIVER,

	DRM_GEM_VRAM_DRIVER_PRIME,

};

drivers/gpu/drm/bochs/bochs_mm.c

+8 −140
Original line number Diff line number Diff line
@@ -9,155 +9,23 @@ 


/* ---------------------------------------------------------------------- */



static inline struct bochs_device *bochs_bdev(struct ttm_bo_device *bd)

{

	return container_of(bd, struct bochs_device, ttm.bdev);

}



static int bochs_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,

				  struct ttm_mem_type_manager *man)

{

	switch (type) {

	case TTM_PL_SYSTEM:

		man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;

		man->available_caching = TTM_PL_MASK_CACHING;

		man->default_caching = TTM_PL_FLAG_CACHED;

		break;

	case TTM_PL_VRAM:

		man->func = &ttm_bo_manager_func;

		man->flags = TTM_MEMTYPE_FLAG_FIXED |

			TTM_MEMTYPE_FLAG_MAPPABLE;

		man->available_caching = TTM_PL_FLAG_UNCACHED |

			TTM_PL_FLAG_WC;

		man->default_caching = TTM_PL_FLAG_WC;

		break;

	default:

		DRM_ERROR("Unsupported memory type %u\n", (unsigned)type);

		return -EINVAL;

	}

	return 0;

}



static int bochs_ttm_io_mem_reserve(struct ttm_bo_device *bdev,

				    struct ttm_mem_reg *mem)

{

	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];

	struct bochs_device *bochs = bochs_bdev(bdev);



	mem->bus.addr = NULL;

	mem->bus.offset = 0;

	mem->bus.size = mem->num_pages << PAGE_SHIFT;

	mem->bus.base = 0;

	mem->bus.is_iomem = false;

	if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE))

		return -EINVAL;

	switch (mem->mem_type) {

	case TTM_PL_SYSTEM:

		/* system memory */

		return 0;

	case TTM_PL_VRAM:

		mem->bus.offset = mem->start << PAGE_SHIFT;

		mem->bus.base = bochs->fb_base;

		mem->bus.is_iomem = true;

		break;

	default:

		return -EINVAL;

		break;

	}

	return 0;

}



static void bochs_ttm_io_mem_free(struct ttm_bo_device *bdev,

				  struct ttm_mem_reg *mem)

{

}



static void bochs_ttm_backend_destroy(struct ttm_tt *tt)

{

	ttm_tt_fini(tt);

	kfree(tt);

}



static struct ttm_backend_func bochs_tt_backend_func = {

	.destroy = &bochs_ttm_backend_destroy,

};



static struct ttm_tt *bochs_ttm_tt_create(struct ttm_buffer_object *bo,

					  uint32_t page_flags)

{

	struct ttm_tt *tt;



	tt = kzalloc(sizeof(struct ttm_tt), GFP_KERNEL);

	if (tt == NULL)

		return NULL;

	tt->func = &bochs_tt_backend_func;

	if (ttm_tt_init(tt, bo, page_flags)) {

		kfree(tt);

		return NULL;

	}

	return tt;

}



static struct ttm_bo_driver bochs_bo_driver = {

	.ttm_tt_create = bochs_ttm_tt_create,

	.init_mem_type = bochs_bo_init_mem_type,

	.eviction_valuable = ttm_bo_eviction_valuable,

	.evict_flags = drm_gem_vram_bo_driver_evict_flags,

	.move = NULL,

	.verify_access = drm_gem_vram_bo_driver_verify_access,

	.io_mem_reserve = &bochs_ttm_io_mem_reserve,

	.io_mem_free = &bochs_ttm_io_mem_free,

};



int bochs_mm_init(struct bochs_device *bochs)

{

	struct ttm_bo_device *bdev = &bochs->ttm.bdev;

	int ret;

	struct drm_vram_mm *vmm;



	ret = ttm_bo_device_init(&bochs->ttm.bdev,

				 &bochs_bo_driver,

				 bochs->dev->anon_inode->i_mapping,

				 true);

	if (ret) {

		DRM_ERROR("Error initialising bo driver; %d\n", ret);

		return ret;

	}



	ret = ttm_bo_init_mm(bdev, TTM_PL_VRAM,

			     bochs->fb_size >> PAGE_SHIFT);

	if (ret) {

		DRM_ERROR("Failed ttm VRAM init: %d\n", ret);

		return ret;

	}

	vmm = drm_vram_helper_alloc_mm(bochs->dev, bochs->fb_base,

				       bochs->fb_size,

				       &drm_gem_vram_mm_funcs);

	if (IS_ERR(vmm))

		return PTR_ERR(vmm);



	bochs->ttm.initialized = true;

	return 0;

}



void bochs_mm_fini(struct bochs_device *bochs)

{

	if (!bochs->ttm.initialized)

	if (!bochs->dev->vram_mm)

		return;



	ttm_bo_device_release(&bochs->ttm.bdev);

	bochs->ttm.initialized = false;

}



int bochs_mmap(struct file *filp, struct vm_area_struct *vma)

{

	struct drm_file *file_priv = filp->private_data;

	struct bochs_device *bochs = file_priv->minor->dev->dev_private;



	return ttm_bo_mmap(filp, vma, &bochs->ttm.bdev);

}



/* ---------------------------------------------------------------------- */



int bochs_dumb_create(struct drm_file *file, struct drm_device *dev,

		      struct drm_mode_create_dumb *args)

{

	struct bochs_device *bochs = dev->dev_private;



	return drm_gem_vram_fill_create_dumb(file, dev, &bochs->ttm.bdev, 0,

					     false, args);

	drm_vram_helper_release_mm(bochs->dev);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE