drm/mgag200: Convert mgag200 driver to VRAM MM (94668ac7) · Commits · 戴 / test

drivers/gpu/drm/mgag200/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@ config DRM_MGAG200
		tristate "Kernel modesetting driver for MGA G200 server engines"
		depends on DRM && PCI && MMU
		select DRM_KMS_HELPER
		select DRM_TTM
		select DRM_VRAM_HELPER
		help
		This is a KMS driver for the MGA G200 server chips, it

drivers/gpu/drm/mgag200/mgag200_drv.c

+2 −12

Original line number	Diff line number	Diff line
		@@ -59,13 +59,7 @@ static void mga_pci_remove(struct pci_dev *pdev)

		static const struct file_operations mgag200_driver_fops = {
		.owner = THIS_MODULE,
		.open = drm_open,
		.release = drm_release,
		.unlocked_ioctl = drm_ioctl,
		.mmap = mgag200_mmap,
		.poll = drm_poll,
		.compat_ioctl = drm_compat_ioctl,
		.read = drm_read,
		DRM_VRAM_MM_FILE_OPERATIONS
		};

		static struct drm_driver driver = {
		@@ -79,11 +73,7 @@ static struct drm_driver driver = {
		.major = DRIVER_MAJOR,
		.minor = DRIVER_MINOR,
		.patchlevel = DRIVER_PATCHLEVEL,

		.gem_free_object_unlocked =
		drm_gem_vram_driver_gem_free_object_unlocked,
		.dumb_create = mgag200_dumb_create,
		.dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset,
		DRM_GEM_VRAM_DRIVER
		};

		static struct pci_driver mgag200_pci_driver = {

drivers/gpu/drm/mgag200/mgag200_drv.h

+2 −9

Original line number	Diff line number	Diff line
		@@ -17,15 +17,12 @@

		#include <drm/drm_encoder.h>
		#include <drm/drm_fb_helper.h>
		#include <drm/ttm/ttm_bo_api.h>
		#include <drm/ttm/ttm_bo_driver.h>
		#include <drm/ttm/ttm_placement.h>
		#include <drm/ttm/ttm_memory.h>
		#include <drm/ttm/ttm_module.h>

		#include <drm/drm_gem.h>
		#include <drm/drm_gem_vram_helper.h>

		#include <drm/drm_vram_mm_helper.h>

		#include <linux/i2c.h>
		#include <linux/i2c-algo-bit.h>

		@@ -212,10 +209,6 @@ struct mga_device {

		int fb_mtrr;

		struct {
		struct ttm_bo_device bdev;
		} ttm;

		/* SE model number stored in reg 0x1e24 */
		u32 unique_rev_id;
		};

drivers/gpu/drm/mgag200/mgag200_main.c

+3 −14

Original line number	Diff line number	Diff line
		@@ -230,10 +230,10 @@ int mgag200_driver_load(struct drm_device *dev, unsigned long flags)
		}

		/* Make small buffers to store a hardware cursor (double buffered icon updates) */
		mdev->cursor.pixels_1 = drm_gem_vram_create(dev, &mdev->ttm.bdev,
		mdev->cursor.pixels_1 = drm_gem_vram_create(dev, &dev->vram_mm->bdev,
		roundup(48*64, PAGE_SIZE),
		0, 0);
		mdev->cursor.pixels_2 = drm_gem_vram_create(dev, &mdev->ttm.bdev,
		mdev->cursor.pixels_2 = drm_gem_vram_create(dev, &dev->vram_mm->bdev,
		roundup(48*64, PAGE_SIZE),
		0, 0);
		if (IS_ERR(mdev->cursor.pixels_2) \|\| IS_ERR(mdev->cursor.pixels_1)) {
		@@ -274,7 +274,6 @@ int mgag200_gem_create(struct drm_device *dev,
		u32 size, bool iskernel,
		struct drm_gem_object **obj)
		{
		struct mga_device *mdev = dev->dev_private;
		struct drm_gem_vram_object *gbo;
		int ret;

		@@ -284,7 +283,7 @@ int mgag200_gem_create(struct drm_device *dev,
		if (size == 0)
		return -EINVAL;

		gbo = drm_gem_vram_create(dev, &mdev->ttm.bdev, size, 0, false);
		gbo = drm_gem_vram_create(dev, &dev->vram_mm->bdev, size, 0, false);
		if (IS_ERR(gbo)) {
		ret = PTR_ERR(gbo);
		if (ret != -ERESTARTSYS)
		@@ -294,13 +293,3 @@ int mgag200_gem_create(struct drm_device *dev,
		*obj = &gbo->gem;
		return 0;
		}

		int mgag200_dumb_create(struct drm_file *file,
		struct drm_device *dev,
		struct drm_mode_create_dumb *args)
		{
		struct mga_device *mdev = dev->dev_private;

		return drm_gem_vram_fill_create_dumb(file, dev, &mdev->ttm.bdev, 0,
		false, args);
		}

drivers/gpu/drm/mgag200/mgag200_ttm.c

+8 −125

Original line number	Diff line number	Diff line
		@@ -26,130 +26,21 @@
		* Authors: Dave Airlie <airlied@redhat.com>
		*/
		#include <drm/drmP.h>
		#include <drm/ttm/ttm_page_alloc.h>

		#include "mgag200_drv.h"

		static inline struct mga_device *
		mgag200_bdev(struct ttm_bo_device *bd)
		{
		return container_of(bd, struct mga_device, ttm.bdev);
		}

		static int
		mgag200_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 mgag200_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 mga_device *mdev = mgag200_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 = pci_resource_start(mdev->dev->pdev, 0);
		mem->bus.is_iomem = true;
		break;
		default:
		return -EINVAL;
		break;
		}
		return 0;
		}

		static void mgag200_ttm_io_mem_free(struct ttm_bo_device bdev, struct ttm_mem_reg mem)
		{
		}

		static void mgag200_ttm_backend_destroy(struct ttm_tt *tt)
		{
		ttm_tt_fini(tt);
		kfree(tt);
		}

		static struct ttm_backend_func mgag200_tt_backend_func = {
		.destroy = &mgag200_ttm_backend_destroy,
		};


		static struct ttm_tt mgag200_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 = &mgag200_tt_backend_func;
		if (ttm_tt_init(tt, bo, page_flags)) {
		kfree(tt);
		return NULL;
		}
		return tt;
		}

		struct ttm_bo_driver mgag200_bo_driver = {
		.ttm_tt_create = mgag200_ttm_tt_create,
		.init_mem_type = mgag200_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 = &mgag200_ttm_io_mem_reserve,
		.io_mem_free = &mgag200_ttm_io_mem_free,
		};

		int mgag200_mm_init(struct mga_device *mdev)
		{
		struct drm_vram_mm *vmm;
		int ret;
		struct drm_device *dev = mdev->dev;
		struct ttm_bo_device *bdev = &mdev->ttm.bdev;

		ret = ttm_bo_device_init(&mdev->ttm.bdev,
		&mgag200_bo_driver,
		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, mdev->mc.vram_size >> PAGE_SHIFT);
		if (ret) {
		DRM_ERROR("Failed ttm VRAM init: %d\n", ret);
		vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(dev->pdev, 0),
		mdev->mc.vram_size,
		&drm_gem_vram_mm_funcs);
		if (IS_ERR(vmm)) {
		ret = PTR_ERR(vmm);
		DRM_ERROR("Error initializing VRAM MM; %d\n", ret);
		return ret;
		}

		@@ -166,18 +57,10 @@ void mgag200_mm_fini(struct mga_device *mdev)
		{
		struct drm_device *dev = mdev->dev;

		ttm_bo_device_release(&mdev->ttm.bdev);
		drm_vram_helper_release_mm(dev);

		arch_io_free_memtype_wc(pci_resource_start(dev->pdev, 0),
		pci_resource_len(dev->pdev, 0));
		arch_phys_wc_del(mdev->fb_mtrr);
		mdev->fb_mtrr = 0;
		}

		int mgag200_mmap(struct file filp, struct vm_area_struct vma)
		{
		struct drm_file *file_priv = filp->private_data;
		struct mga_device *mdev = file_priv->minor->dev->dev_private;

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

Admin message