drm/hisilicon: Convert hibmc-drm driver to VRAM MM

The data structure |struct drm_vram_mm| and its helpers replace hibmc's
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 hibmc_mmap() with drm_vram_mm_mmap()

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: http://patchwork.freedesktop.org/patch/msgid/20190508082630.15116-21-tzimmermann@suse.de
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/drivers/gpu/drm/hisilicon/hibmc/Kconfig b/drivers/gpu/drm/hisilicon/hibmc/Kconfig
index 04d0bc6..c36ec03 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/Kconfig
+++ b/drivers/gpu/drm/hisilicon/hibmc/Kconfig
@@ -2,7 +2,6 @@ config DRM_HISI_HIBMC
        tristate "DRM Support for Hisilicon Hibmc"
        depends on DRM && PCI && MMU
        select DRM_KMS_HELPER
-       select DRM_TTM
        select DRM_VRAM_HELPER
 
        help

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
index 7027a1a..725c0f5 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
@@ -27,14 +27,7 @@
 
 static const struct file_operations hibmc_fops = {
        .owner          = THIS_MODULE,
-       .open           = drm_open,
-       .release        = drm_release,
-       .unlocked_ioctl = drm_ioctl,
-       .compat_ioctl   = drm_compat_ioctl,
-       .mmap           = hibmc_mmap,
-       .poll           = drm_poll,
-       .read           = drm_read,
-       .llseek         = no_llseek,
+       DRM_VRAM_MM_FILE_OPERATIONS
 };
 
 static irqreturn_t hibmc_drm_interrupt(int irq, void *arg)

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
index 6b3430f..3967693 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
@@ -24,7 +24,7 @@
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_gem_vram_helper.h>
-#include <drm/ttm/ttm_bo_driver.h>
+#include <drm/drm_vram_mm_helper.h>
 
 struct hibmc_framebuffer {
        struct drm_framebuffer fb;
@@ -49,13 +49,8 @@ struct hibmc_drm_private {
        struct drm_device  *dev;
        bool mode_config_initialized;
 
-       /* ttm */
-       struct ttm_bo_device bdev;
-       bool initialized;
-
        /* fbdev */
        struct hibmc_fbdev *fbdev;
-       bool mm_inited;
 };
 
 #define to_hibmc_framebuffer(x) container_of(x, struct hibmc_framebuffer, fb)
@@ -81,7 +76,6 @@ int hibmc_mm_init(struct hibmc_drm_private *hibmc);
 void hibmc_mm_fini(struct hibmc_drm_private *hibmc);
 int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev,
                      struct drm_mode_create_dumb *args);
-int hibmc_mmap(struct file *filp, struct vm_area_struct *vma);
 
 extern const struct drm_mode_config_funcs hibmc_mode_funcs;
 

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
index fbf8eb0..52fba8c 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
@@ -17,157 +17,38 @@
  */
 
 #include <drm/drm_atomic_helper.h>
-#include <drm/ttm/ttm_page_alloc.h>
 
 #include "hibmc_drm_drv.h"
 
-static inline struct hibmc_drm_private *
-hibmc_bdev(struct ttm_bo_device *bd)
-{
-       return container_of(bd, struct hibmc_drm_private, bdev);
-}
-
-static int
-hibmc_bo_init_mem_type(struct ttm_bo_device *bdev, u32 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", type);
-               return -EINVAL;
-       }
-       return 0;
-}
-
-static int hibmc_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 hibmc_drm_private *hibmc = hibmc_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(hibmc->dev->pdev, 0);
-               mem->bus.is_iomem = true;
-               break;
-       default:
-               return -EINVAL;
-       }
-       return 0;
-}
-
-static void hibmc_ttm_backend_destroy(struct ttm_tt *tt)
-{
-       ttm_tt_fini(tt);
-       kfree(tt);
-}
-
-static struct ttm_backend_func hibmc_tt_backend_func = {
-       .destroy = &hibmc_ttm_backend_destroy,
-};
-
-static struct ttm_tt *hibmc_ttm_tt_create(struct ttm_buffer_object *bo,
-                                         u32 page_flags)
-{
-       struct ttm_tt *tt;
-       int ret;
-
-       tt = kzalloc(sizeof(*tt), GFP_KERNEL);
-       if (!tt) {
-               DRM_ERROR("failed to allocate ttm_tt\n");
-               return NULL;
-       }
-       tt->func = &hibmc_tt_backend_func;
-       ret = ttm_tt_init(tt, bo, page_flags);
-       if (ret) {
-               DRM_ERROR("failed to initialize ttm_tt: %d\n", ret);
-               kfree(tt);
-               return NULL;
-       }
-       return tt;
-}
-
-struct ttm_bo_driver hibmc_bo_driver = {
-       .ttm_tt_create          = hibmc_ttm_tt_create,
-       .init_mem_type          = hibmc_bo_init_mem_type,
-       .evict_flags            = drm_gem_vram_bo_driver_evict_flags,
-       .move                   = NULL,
-       .verify_access          = drm_gem_vram_bo_driver_verify_access,
-       .io_mem_reserve         = &hibmc_ttm_io_mem_reserve,
-       .io_mem_free            = NULL,
-};
-
 int hibmc_mm_init(struct hibmc_drm_private *hibmc)
 {
+       struct drm_vram_mm *vmm;
        int ret;
        struct drm_device *dev = hibmc->dev;
-       struct ttm_bo_device *bdev = &hibmc->bdev;
-
-       ret = ttm_bo_device_init(&hibmc->bdev,
-                                &hibmc_bo_driver,
-                                dev->anon_inode->i_mapping,
-                                true);
-       if (ret) {
-               DRM_ERROR("error initializing bo driver: %d\n", ret);
-               return ret;
-       }
 
-       ret = ttm_bo_init_mm(bdev, TTM_PL_VRAM,
-                            hibmc->fb_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),
+                                      hibmc->fb_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;
        }
 
-       hibmc->mm_inited = true;
        return 0;
 }
 
 void hibmc_mm_fini(struct hibmc_drm_private *hibmc)
 {
-       if (!hibmc->mm_inited)
+       if (!hibmc->dev->vram_mm)
                return;
 
-       ttm_bo_device_release(&hibmc->bdev);
-       hibmc->mm_inited = false;
-}
-
-int hibmc_mmap(struct file *filp, struct vm_area_struct *vma)
-{
-       struct drm_file *file_priv = filp->private_data;
-       struct hibmc_drm_private *hibmc = file_priv->minor->dev->dev_private;
-
-       return ttm_bo_mmap(filp, vma, &hibmc->bdev);
+       drm_vram_helper_release_mm(hibmc->dev);
 }
 
 int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel,
                     struct drm_gem_object **obj)
 {
-       struct hibmc_drm_private *hibmc = dev->dev_private;
        struct drm_gem_vram_object *gbo;
        int ret;
 
@@ -177,7 +58,7 @@ int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel,
        if (size == 0)
                return -EINVAL;
 
-       gbo = drm_gem_vram_create(dev, &hibmc->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)