From: "Christian König" <christian.koenig@amd.com>
To: Dave Airlie <airlied@gmail.com>, dri-devel@lists.freedesktop.org
Cc: sroland@vmware.com, bskeggs@redhat.com, kraxel@redhat.com
Subject: Re: [PATCH 38/49] drm/amdgpu/ttm: use bo manager subclassing for vram/gtt mgrs
Date: Fri, 31 Jul 2020 15:29:57 +0200 [thread overview]
Message-ID: <46f1e049-b34a-8d18-d8a7-3fadaee1b833@amd.com> (raw)
In-Reply-To: <20200731040520.3701599-39-airlied@gmail.com>
Am 31.07.20 um 06:05 schrieb Dave Airlie:
> From: Dave Airlie <airlied@redhat.com>
>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 35 +++++++++++--------
> drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 36 +++++++++++++-------
> 2 files changed, 44 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> index 0b0d09d19b4f..83d88ee73468 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> @@ -25,11 +25,17 @@
> #include "amdgpu.h"
>
> struct amdgpu_gtt_mgr {
> + struct ttm_mem_type_manager manager;
> struct drm_mm mm;
> spinlock_t lock;
> atomic64_t available;
> };
>
> +static inline struct amdgpu_gtt_mgr *to_gtt_mgr(struct ttm_mem_type_manager *man)
> +{
> + return container_of(man, struct amdgpu_gtt_mgr, manager);
> +}
> +
> struct amdgpu_gtt_node {
> struct drm_mm_node node;
> struct ttm_buffer_object *tbo;
> @@ -87,11 +93,16 @@ static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;
> */
> int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
> {
> - struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
> + struct ttm_mem_type_manager *man;
> struct amdgpu_gtt_mgr *mgr;
> uint64_t start, size;
> int ret;
>
> + mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
> + if (!mgr)
> + return -ENOMEM;
> +
> + man = &mgr->manager;
> man->use_tt = true;
> man->func = &amdgpu_gtt_mgr_func;
> man->available_caching = TTM_PL_MASK_CACHING;
> @@ -99,16 +110,11 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
>
> ttm_bo_init_mm_base(&adev->mman.bdev, man, gtt_size >> PAGE_SHIFT);
>
> - mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
> - if (!mgr)
> - return -ENOMEM;
> -
> start = AMDGPU_GTT_MAX_TRANSFER_SIZE * AMDGPU_GTT_NUM_TRANSFER_WINDOWS;
> size = (adev->gmc.gart_size >> PAGE_SHIFT) - start;
> drm_mm_init(&mgr->mm, start, size);
> spin_lock_init(&mgr->lock);
> atomic64_set(&mgr->available, gtt_size >> PAGE_SHIFT);
> - man->priv = mgr;
>
> ret = device_create_file(adev->dev, &dev_attr_mem_info_gtt_total);
> if (ret) {
> @@ -121,6 +127,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
> return ret;
> }
>
> + ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_TT, &mgr->manager);
> ttm_bo_use_mm(man);
> return 0;
> }
> @@ -136,7 +143,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
> void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)
> {
> struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
> - struct amdgpu_gtt_mgr *mgr = man->priv;
> + struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
> int ret;
>
> ttm_bo_disable_mm(man);
> @@ -148,13 +155,13 @@ void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)
> spin_lock(&mgr->lock);
> drm_mm_takedown(&mgr->mm);
> spin_unlock(&mgr->lock);
> - kfree(mgr);
> - man->priv = NULL;
>
> device_remove_file(adev->dev, &dev_attr_mem_info_gtt_total);
> device_remove_file(adev->dev, &dev_attr_mem_info_gtt_used);
>
> ttm_bo_man_cleanup(man);
> + ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_TT, NULL);
> + kfree(mgr);
> }
>
> /**
> @@ -184,7 +191,7 @@ static int amdgpu_gtt_mgr_new(struct ttm_mem_type_manager *man,
> const struct ttm_place *place,
> struct ttm_mem_reg *mem)
> {
> - struct amdgpu_gtt_mgr *mgr = man->priv;
> + struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
> struct amdgpu_gtt_node *node;
> int r;
>
> @@ -245,7 +252,7 @@ static int amdgpu_gtt_mgr_new(struct ttm_mem_type_manager *man,
> static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man,
> struct ttm_mem_reg *mem)
> {
> - struct amdgpu_gtt_mgr *mgr = man->priv;
> + struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
> struct amdgpu_gtt_node *node = mem->mm_node;
>
> if (node) {
> @@ -267,7 +274,7 @@ static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man,
> */
> uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man)
> {
> - struct amdgpu_gtt_mgr *mgr = man->priv;
> + struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
> s64 result = man->size - atomic64_read(&mgr->available);
>
> return (result > 0 ? result : 0) * PAGE_SIZE;
> @@ -275,7 +282,7 @@ uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man)
>
> int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man)
> {
> - struct amdgpu_gtt_mgr *mgr = man->priv;
> + struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
> struct amdgpu_gtt_node *node;
> struct drm_mm_node *mm_node;
> int r = 0;
> @@ -303,7 +310,7 @@ int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man)
> static void amdgpu_gtt_mgr_debug(struct ttm_mem_type_manager *man,
> struct drm_printer *printer)
> {
> - struct amdgpu_gtt_mgr *mgr = man->priv;
> + struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
>
> spin_lock(&mgr->lock);
> drm_mm_print(&mgr->mm, printer);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> index d33a750e07a8..9d4a13926b8c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> @@ -29,12 +29,18 @@
> #include "atom.h"
>
> struct amdgpu_vram_mgr {
> + struct ttm_mem_type_manager manager;
> struct drm_mm mm;
> spinlock_t lock;
> atomic64_t usage;
> atomic64_t vis_usage;
> };
>
> +static inline struct amdgpu_vram_mgr *to_vram_mgr(struct ttm_mem_type_manager *man)
> +{
> + return container_of(man, struct amdgpu_vram_mgr, manager);
> +}
> +
> /**
> * DOC: mem_info_vram_total
> *
> @@ -170,29 +176,32 @@ static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;
> */
> int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
> {
> - struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
> + struct ttm_mem_type_manager *man;
> struct amdgpu_vram_mgr *mgr;
> int ret;
>
> + mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
> + if (!mgr)
> + return -ENOMEM;
> +
> + man = &mgr->manager;
> +
> man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
> man->default_caching = TTM_PL_FLAG_WC;
>
> ttm_bo_init_mm_base(&adev->mman.bdev, man, adev->gmc.real_vram_size >> PAGE_SHIFT);
>
> man->func = &amdgpu_vram_mgr_func;
> - mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
> - if (!mgr)
> - return -ENOMEM;
>
> drm_mm_init(&mgr->mm, 0, man->size);
> spin_lock_init(&mgr->lock);
> - man->priv = mgr;
>
> /* Add the two VRAM-related sysfs files */
> ret = sysfs_create_files(&adev->dev->kobj, amdgpu_vram_mgr_attributes);
> if (ret)
> DRM_ERROR("Failed to register sysfs\n");
>
> + ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_VRAM, &mgr->manager);
> ttm_bo_use_mm(man);
> return 0;
> }
> @@ -208,7 +217,7 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
> void amdgpu_vram_mgr_fini(struct amdgpu_device *adev)
> {
> struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
> - struct amdgpu_vram_mgr *mgr = man->priv;
> + struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
> int ret;
>
> ttm_bo_disable_mm(man);
> @@ -220,11 +229,12 @@ void amdgpu_vram_mgr_fini(struct amdgpu_device *adev)
> spin_lock(&mgr->lock);
> drm_mm_takedown(&mgr->mm);
> spin_unlock(&mgr->lock);
> - kfree(mgr);
> - man->priv = NULL;
> +
> sysfs_remove_files(&adev->dev->kobj, amdgpu_vram_mgr_attributes);
>
> ttm_bo_man_cleanup(man);
> + ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_VRAM, NULL);
> + kfree(mgr);
> }
>
> /**
> @@ -314,7 +324,7 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
> struct ttm_mem_reg *mem)
> {
> struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
> - struct amdgpu_vram_mgr *mgr = man->priv;
> + struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
> struct drm_mm *mm = &mgr->mm;
> struct drm_mm_node *nodes;
> enum drm_mm_insert_mode mode;
> @@ -430,7 +440,7 @@ static void amdgpu_vram_mgr_del(struct ttm_mem_type_manager *man,
> struct ttm_mem_reg *mem)
> {
> struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
> - struct amdgpu_vram_mgr *mgr = man->priv;
> + struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
> struct drm_mm_node *nodes = mem->mm_node;
> uint64_t usage = 0, vis_usage = 0;
> unsigned pages = mem->num_pages;
> @@ -562,7 +572,7 @@ void amdgpu_vram_mgr_free_sgt(struct amdgpu_device *adev,
> */
> uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man)
> {
> - struct amdgpu_vram_mgr *mgr = man->priv;
> + struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
>
> return atomic64_read(&mgr->usage);
> }
> @@ -576,7 +586,7 @@ uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man)
> */
> uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man)
> {
> - struct amdgpu_vram_mgr *mgr = man->priv;
> + struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
>
> return atomic64_read(&mgr->vis_usage);
> }
> @@ -592,7 +602,7 @@ uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man)
> static void amdgpu_vram_mgr_debug(struct ttm_mem_type_manager *man,
> struct drm_printer *printer)
> {
> - struct amdgpu_vram_mgr *mgr = man->priv;
> + struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
>
> spin_lock(&mgr->lock);
> drm_mm_print(&mgr->mm, printer);
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-07-31 13:30 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-31 4:04 [PATCH 00/49] ttm mem manager refactoring Dave Airlie
2020-07-31 4:04 ` [PATCH 01/49] drm/qxl/ttm: call ttm manager debug Dave Airlie
2020-07-31 4:04 ` [PATCH 02/49] drm/vram-helper: call the ttm manager debug function Dave Airlie
2020-07-31 6:43 ` Thomas Zimmermann
2020-07-31 4:04 ` [PATCH 03/49] drm/ttm: split the mm manager init code Dave Airlie
2020-07-31 5:44 ` Sam Ravnborg
2020-07-31 5:51 ` Dave Airlie
2020-07-31 6:26 ` Dave Airlie
2020-07-31 6:43 ` Sam Ravnborg
2020-07-31 9:12 ` Christian König
2020-07-31 4:04 ` [PATCH 04/49] drm/ttm: provide a driver-led init path for generic mm manager Dave Airlie
2020-07-31 6:57 ` Thomas Zimmermann
2020-07-31 7:03 ` Thomas Zimmermann
2020-07-31 7:20 ` Dave Airlie
2020-07-31 13:00 ` Christian König
2020-07-31 4:04 ` [PATCH 05/49] drm/amdgpu/ttm: init managers from the driver side Dave Airlie
2020-07-31 4:04 ` [PATCH 06/49] drm/radeon: use new ttm man init path Dave Airlie
2020-07-31 4:04 ` [PATCH 07/49] drm/qxl/ttm: use new init path for manager Dave Airlie
2020-07-31 4:04 ` [PATCH 08/49] drm/vram_helper: use new ttm manager init function Dave Airlie
2020-07-31 4:04 ` [PATCH 09/49] drm/nouveau: use new memory manager init paths Dave Airlie
2020-07-31 4:04 ` [PATCH 10/49] drm/vmwgfx/ttm: convert vram mm init to new code paths Dave Airlie
2020-07-31 4:04 ` [PATCH 11/49] drm/vmwgfx/ttm: switch gmrid allocator to new init paths Dave Airlie
2020-07-31 4:04 ` [PATCH 12/49] drm/ttm: convert system manager init to new code Dave Airlie
2020-07-31 12:57 ` Christian König
2020-07-31 4:04 ` [PATCH 13/49] drm/ttm: purge old manager init path Dave Airlie
2020-07-31 12:58 ` Christian König
2020-07-31 4:04 ` [PATCH 14/49] drm/ttm: pass man around instead of mem_type in some places Dave Airlie
2020-07-31 13:04 ` Christian König
2020-07-31 4:04 ` [PATCH 15/49] drm/ttm: make some inline helper functions for cleanup paths Dave Airlie
2020-07-31 13:07 ` Christian König
2020-08-04 2:28 ` Dave Airlie
2020-07-31 4:04 ` [PATCH 16/49] drm/ttm: start allowing drivers to use new takedown path Dave Airlie
2020-07-31 13:09 ` Christian König
2020-07-31 4:04 ` [PATCH 17/49] drm/amdgpu/ttm: " Dave Airlie
2020-07-31 13:08 ` Christian König
2020-07-31 4:04 ` [PATCH 18/49] drm/vmwgfx: takedown vram manager Dave Airlie
2020-07-31 4:04 ` [PATCH 19/49] drm/vram_helper: call explicit mm takedown Dave Airlie
2020-07-31 4:04 ` [PATCH 20/49] drm/nouveau: use new cleanup paths Dave Airlie
2020-07-31 4:04 ` [PATCH 21/49] drm/radeon/ttm: use new takedown paths Dave Airlie
2020-07-31 13:10 ` Christian König
2020-07-31 4:04 ` [PATCH 22/49] drm/qxl/ttm: use new takedown path Dave Airlie
2020-07-31 4:04 ` [PATCH 23/49] drm/vmwgfx: fix gmrid takedown paths to new interface Dave Airlie
2020-07-31 4:04 ` [PATCH 24/49] drm/ttm: remove range manager legacy takedown path Dave Airlie
2020-07-31 13:11 ` Christian König
2020-07-31 4:04 ` [PATCH 25/49] drm/ttm: make TTM responsible for cleaning system only Dave Airlie
2020-07-31 13:19 ` Christian König
2020-07-31 4:04 ` [PATCH 26/49] drm/ttm: add wrapper to get manager from bdev Dave Airlie
2020-07-31 7:14 ` Thomas Zimmermann
2020-07-31 7:21 ` Dave Airlie
2020-07-31 13:18 ` daniel
2020-07-31 13:23 ` Christian König
2020-07-31 21:06 ` Dave Airlie
2020-07-31 4:04 ` [PATCH 27/49] drm/amdgfx/ttm: use wrapper to get ttm memory managers Dave Airlie
2020-07-31 4:04 ` [PATCH 28/49] drm/vram-helper: use wrapper to access " Dave Airlie
2020-07-31 4:05 ` [PATCH 29/49] drm/nouveau/ttm: " Dave Airlie
2020-07-31 4:05 ` [PATCH 30/49] drm/qxl/ttm: use wrapper to access memory manager Dave Airlie
2020-07-31 4:05 ` [PATCH 31/49] drm/radeon/ttm: " Dave Airlie
2020-07-31 4:05 ` [PATCH 32/49] drm/vmwgfx/ttm: " Dave Airlie
2020-07-31 4:05 ` [PATCH 33/49] drm/ttm: rename manager variable to make sure wrapper is used Dave Airlie
2020-07-31 4:05 ` [PATCH 34/49] drm/ttm: make manager debug function optional Dave Airlie
2020-07-31 9:46 ` daniel
2020-07-31 13:03 ` Christian König
2020-07-31 13:24 ` Christian König
2020-07-31 4:05 ` [PATCH 35/49] drm/nouveau/ttm: don't fill in blank ttm debug callback Dave Airlie
2020-07-31 13:25 ` Christian König
2020-07-31 4:05 ` [PATCH 36/49] drm/vmwgfx/gmrid: don't provide pointless " Dave Airlie
2020-07-31 13:26 ` Christian König
2020-07-31 4:05 ` [PATCH 37/49] drm/ttm: allow drivers to provide their own manager subclasses Dave Airlie
2020-07-31 4:05 ` [PATCH 38/49] drm/amdgpu/ttm: use bo manager subclassing for vram/gtt mgrs Dave Airlie
2020-07-31 13:29 ` Christian König [this message]
2020-07-31 4:05 ` [PATCH 39/49] drm/ttm: make ttm_bo_man_init/takedown take type + args Dave Airlie
2020-07-31 13:32 ` Christian König
2020-08-04 1:42 ` Dave Airlie
2020-08-04 10:26 ` Christian König
2020-08-06 3:46 ` Dave Airlie
2020-08-06 8:24 ` Christian König
2020-07-31 4:05 ` [PATCH 40/49] drm/ttm: move range manager to subclassed driver allocation Dave Airlie
2020-07-31 13:33 ` Christian König
2020-07-31 4:05 ` [PATCH 41/49] drm/vmwgfx/ttm: move thp to driver managed Dave Airlie
2020-07-31 4:05 ` [PATCH 42/49] drm/vmwgfx/gmrid: convert to driver controlled allocation Dave Airlie
2020-07-31 4:05 ` [PATCH 43/49] drm/nouveau/ttm: move to driver allocated manager Dave Airlie
2020-07-31 4:05 ` [PATCH 44/49] drm/ttm: drop priv pointer in memory manager Dave Airlie
2020-07-31 13:33 ` Christian König
2020-07-31 4:05 ` [PATCH 45/49] drm/amdgpu/ttm: remove man->bdev references Dave Airlie
2020-07-31 14:55 ` Christian König
2020-07-31 4:05 ` [PATCH 46/49] drm/ttm: drop man->bdev link Dave Airlie
2020-07-31 14:54 ` Christian König
2020-07-31 4:05 ` [PATCH 47/49] drm/ttm: drop list of memory managers from device Dave Airlie
2020-07-31 9:55 ` daniel
2020-07-31 14:57 ` Christian König
2020-07-31 4:05 ` [PATCH 48/49] drm/ttm: drop type manager has_type Dave Airlie
2020-07-31 4:05 ` [PATCH 49/49] drm/ttm: consolidate manager used apis into a set and get Dave Airlie
2020-07-31 9:51 ` daniel
2020-07-31 14:59 ` Christian König
2020-07-31 9:17 ` [PATCH 00/49] ttm mem manager refactoring Christian König
2020-07-31 9:29 ` daniel
2020-07-31 13:01 ` Christian König
2020-08-03 7:12 ` Dave Airlie
2020-08-03 11:13 ` Christian König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46f1e049-b34a-8d18-d8a7-3fadaee1b833@amd.com \
--to=christian.koenig@amd.com \
--cc=airlied@gmail.com \
--cc=bskeggs@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kraxel@redhat.com \
--cc=sroland@vmware.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).