On Wed, Apr 24, 2019 at 01:48:32PM +0200, Thomas Zimmermann wrote:
> The data structure |struct drm_vram_mm| and its helpers replace ast's
> TTM-based memory manager. It's the same implementation; except for the
> type names.
>
> v2:
> * implement ast_mmap() with drm_vram_mm_mmap()
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
> ---
> drivers/gpu/drm/ast/Kconfig | 1 +
> drivers/gpu/drm/ast/ast_drv.h | 12 +---
> drivers/gpu/drm/ast/ast_main.c | 4 +-
> drivers/gpu/drm/ast/ast_ttm.c | 123 +++------------------------------
> 4 files changed, 14 insertions(+), 126 deletions(-)
>
> diff --git a/drivers/gpu/drm/ast/Kconfig b/drivers/gpu/drm/ast/Kconfig
> index d1d90f8c7a8f..ecc9c905b81b 100644
> --- a/drivers/gpu/drm/ast/Kconfig
> +++ b/drivers/gpu/drm/ast/Kconfig
> @@ -4,6 +4,7 @@ config DRM_AST
> select DRM_TTM
> select DRM_KMS_HELPER
> select DRM_GEM_VRAM_HELPER
> + select DRM_VRAM_MM_HELPER
> help
> Say yes for experimental AST GPU driver. Do not enable
> this driver without having a working -modesetting,
> diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
> index 712838f725dc..8fee400f5c41 100644
> --- a/drivers/gpu/drm/ast/ast_drv.h
> +++ b/drivers/gpu/drm/ast/ast_drv.h
> @@ -31,15 +31,11 @@
> #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>
>
> @@ -104,9 +100,7 @@ struct ast_private {
>
> int fb_mtrr;
>
> - struct {
> - struct ttm_bo_device bdev;
> - } ttm;
> + struct drm_vram_mm vmm;
>
> struct drm_gem_object *cursor_cache;
> uint64_t cursor_cache_gpu_addr;
> diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
> index 61fc7b8ea470..92510251fe25 100644
> --- a/drivers/gpu/drm/ast/ast_main.c
> +++ b/drivers/gpu/drm/ast/ast_main.c
> @@ -603,7 +603,7 @@ int ast_gem_create(struct drm_device *dev,
> if (size == 0)
> return -EINVAL;
>
> - gbo = drm_gem_vram_create(dev, &ast->ttm.bdev, size, 0, false);
> + gbo = drm_gem_vram_create(dev, &ast->vmm.bdev, size, 0, false);
> if (IS_ERR(gbo)) {
> ret = PTR_ERR(gbo);
> if (ret != -ERESTARTSYS)
> @@ -620,6 +620,6 @@ int ast_dumb_create(struct drm_file *file,
> {
> struct ast_private *ast = dev->dev_private;
>
> - return drm_gem_vram_fill_create_dumb(file, dev, &ast->ttm.bdev, 0,
> + return drm_gem_vram_fill_create_dumb(file, dev, &ast->vmm.bdev, 0,
> false, args);
I think storing the vram mm somewhere in drm_device would be nice, so that
we can avoid all these trivial wrappers. Similar to how we store
drm_device->dev already, so that cma helpers just work. Next to
object_name_idr and vma_offset_manager, so it's at least grouped together.
Also with that you create an _OPS macro like for CMA helpers, to condense
boilerplat even more.
-Daniel
> }
> diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c
> index 794ebb755a5d..78032327b64b 100644
> --- a/drivers/gpu/drm/ast/ast_ttm.c
> +++ b/drivers/gpu/drm/ast/ast_ttm.c
> @@ -26,131 +26,24 @@
> * Authors: Dave Airlie <airlied@xxxxxxxxxx>
> */
> #include <drm/drmP.h>
> -#include <drm/ttm/ttm_page_alloc.h>
>
> #include "ast_drv.h"
>
> -static inline struct ast_private *
> -ast_bdev(struct ttm_bo_device *bd)
> -{
> - return container_of(bd, struct ast_private, ttm.bdev);
> -}
> -
> -static int
> -ast_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 ast_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 ast_private *ast = ast_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(ast->dev->pdev, 0);
> - mem->bus.is_iomem = true;
> - break;
> - default:
> - return -EINVAL;
> - break;
> - }
> - return 0;
> -}
> -
> -static void ast_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
> -{
> -}
> -
> -static void ast_ttm_backend_destroy(struct ttm_tt *tt)
> -{
> - ttm_tt_fini(tt);
> - kfree(tt);
> -}
> -
> -static struct ttm_backend_func ast_tt_backend_func = {
> - .destroy = &ast_ttm_backend_destroy,
> -};
> -
> -
> -static struct ttm_tt *ast_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 = &ast_tt_backend_func;
> - if (ttm_tt_init(tt, bo, page_flags)) {
> - kfree(tt);
> - return NULL;
> - }
> - return tt;
> -}
> -
> -struct ttm_bo_driver ast_bo_driver = {
> - .ttm_tt_create = ast_ttm_tt_create,
> - .init_mem_type = ast_bo_init_mem_type,
> - .eviction_valuable = ttm_bo_eviction_valuable,
> +static const struct drm_vram_mm_funcs ast_vram_mm_funcs = {
> .evict_flags = drm_gem_vram_bo_driver_evict_flags,
> - .move = NULL,
> - .verify_access = drm_gem_vram_bo_driver_verify_access,
> - .io_mem_reserve = &ast_ttm_io_mem_reserve,
> - .io_mem_free = &ast_ttm_io_mem_free,
> + .verify_access = drm_gem_vram_bo_driver_verify_access
> };
>
> int ast_mm_init(struct ast_private *ast)
> {
> int ret;
> struct drm_device *dev = ast->dev;
> - struct ttm_bo_device *bdev = &ast->ttm.bdev;
> -
> - ret = ttm_bo_device_init(&ast->ttm.bdev,
> - &ast_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,
> - ast->vram_size >> PAGE_SHIFT);
> + ret = drm_vram_mm_init(&ast->vmm, dev,
> + pci_resource_start(dev->pdev, 0),
> + ast->vram_size, &ast_vram_mm_funcs);
> if (ret) {
> - DRM_ERROR("Failed ttm VRAM init: %d\n", ret);
> + DRM_ERROR("Error initializing VRAM MM; %d\n", ret);
> return ret;
> }
>
> @@ -166,7 +59,7 @@ void ast_mm_fini(struct ast_private *ast)
> {
> struct drm_device *dev = ast->dev;
>
> - ttm_bo_device_release(&ast->ttm.bdev);
> + drm_vram_mm_cleanup(&ast->vmm);
>
> arch_phys_wc_del(ast->fb_mtrr);
> arch_io_free_memtype_wc(pci_resource_start(dev->pdev, 0),
> @@ -178,5 +71,5 @@ int ast_mmap(struct file *filp, struct vm_area_struct *vma)
> struct drm_file *file_priv = filp->private_data;
> struct ast_private *ast = file_priv->minor->dev->dev_private;
>
> - return ttm_bo_mmap(filp, vma, &ast->ttm.bdev);
> + return drm_vram_mm_mmap(filp, vma, &ast->vmm);
> }
> --
> 2.21.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Virtualization mailing list
Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
