[PATCH 15/15] drm/hisilicon: Convert hibmc-drm driver to Simple TTM
Thomas Zimmermann
tzimmermann at suse.de
Mon Apr 8 09:21:44 UTC 2019
Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de>
---
drivers/gpu/drm/hisilicon/hibmc/Kconfig | 1 +
.../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 3 +-
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 124 ++----------------
3 files changed, 13 insertions(+), 115 deletions(-)
diff --git a/drivers/gpu/drm/hisilicon/hibmc/Kconfig b/drivers/gpu/drm/hisilicon/hibmc/Kconfig
index 98fc7d546d2a..a0cb0d838105 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/Kconfig
+++ b/drivers/gpu/drm/hisilicon/hibmc/Kconfig
@@ -4,6 +4,7 @@ config DRM_HISI_HIBMC
select DRM_KMS_HELPER
select DRM_TTM
select DRM_GEM_TTM_HELPER
+ select DRM_SIMPLE_TTM_HELPER
help
Choose this option if you have a Hisilicon Hibmc soc chipset.
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
index a46fa0474b59..541edbd9bba7 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
@@ -24,6 +24,7 @@
#include <drm/drm_fb_helper.h>
#include <drm/drm_gem.h>
#include <drm/drm_gem_ttm_helper.h>
+#include <drm/drm_simple_ttm_helper.h>
#include <drm/ttm/ttm_bo_driver.h>
struct hibmc_framebuffer {
@@ -50,7 +51,7 @@ struct hibmc_drm_private {
bool mode_config_initialized;
/* ttm */
- struct ttm_bo_device bdev;
+ struct drm_simple_ttm ttm;
bool initialized;
/* fbdev */
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
index cbe42a4f3f08..ca28ef9357a9 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
@@ -21,125 +21,21 @@
#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_ttm_bo_driver_evict_flags,
- .move = NULL,
- .verify_access = drm_gem_ttm_bo_driver_verify_access,
- .io_mem_reserve = &hibmc_ttm_io_mem_reserve,
- .io_mem_free = NULL,
+static const struct drm_simple_ttm_funcs hibmc_simple_ttm_funcs = {
+ .evict_flags = drm_gem_ttm_bo_driver_evict_flags,
+ .verify_access = drm_gem_ttm_bo_driver_verify_access
};
int hibmc_mm_init(struct hibmc_drm_private *hibmc)
{
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);
+ ret = drm_simple_ttm_init(&hibmc->ttm, dev,
+ pci_resource_start(dev->pdev, 0),
+ hibmc->fb_size, &hibmc_simple_ttm_funcs);
if (ret) {
- DRM_ERROR("failed ttm VRAM init: %d\n", ret);
+ DRM_ERROR("Error initializing Simple TTM; %d\n", ret);
return ret;
}
@@ -152,7 +48,7 @@ void hibmc_mm_fini(struct hibmc_drm_private *hibmc)
if (!hibmc->mm_inited)
return;
- ttm_bo_device_release(&hibmc->bdev);
+ drm_simple_ttm_cleanup(&hibmc->ttm);
hibmc->mm_inited = false;
}
@@ -161,7 +57,7 @@ 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);
+ return ttm_bo_mmap(filp, vma, &hibmc->ttm.bdev);
}
int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel,
@@ -177,7 +73,7 @@ int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel,
if (size == 0)
return -EINVAL;
- gbo = drm_gem_ttm_create(dev, &hibmc->bdev, size, 0, false);
+ gbo = drm_gem_ttm_create(dev, &hibmc->ttm.bdev, size, 0, false);
if (IS_ERR(gbo)) {
ret = PTR_ERR(gbo);
if (ret != -ERESTARTSYS)
--
2.21.0
More information about the dri-devel
mailing list