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 16/49] drm/ttm: start allowing drivers to use new takedown path
Date: Fri, 31 Jul 2020 15:09:59 +0200 [thread overview]
Message-ID: <163112c1-cc21-f37d-fd22-72a688fb1038@amd.com> (raw)
In-Reply-To: <20200731040520.3701599-17-airlied@gmail.com>
Am 31.07.20 um 06:04 schrieb Dave Airlie:
> From: Dave Airlie <airlied@redhat.com>
>
> Allow the takedown path callback to be optional as well.
>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
> ---
> drivers/gpu/drm/ttm/ttm_bo.c | 8 +++++---
> drivers/gpu/drm/ttm/ttm_bo_manager.c | 21 +++++++++++++++++++--
> include/drm/ttm/ttm_bo_driver.h | 5 ++++-
> 3 files changed, 28 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index f584e5e94383..f0f0f3101bd1 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -1401,8 +1401,8 @@ int ttm_bo_create(struct ttm_bo_device *bdev,
> }
> EXPORT_SYMBOL(ttm_bo_create);
>
> -static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
> - struct ttm_mem_type_manager *man)
> +int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
> + struct ttm_mem_type_manager *man)
> {
> struct ttm_operation_ctx ctx = {
> .interruptible = false,
> @@ -1444,6 +1444,7 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
>
> return 0;
> }
> +EXPORT_SYMBOL(ttm_bo_force_list_clean);
>
> int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
> {
> @@ -1472,7 +1473,8 @@ int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
> return ret;
> }
>
> - ret = (*man->func->takedown)(man);
> + if (man->func->takedown)
> + ret = (*man->func->takedown)(man);
> }
>
> ttm_bo_man_cleanup(man);
> diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
> index 1877425abdf0..1127868274b3 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
> @@ -129,7 +129,7 @@ int ttm_bo_man_init(struct ttm_bo_device *bdev,
> }
> EXPORT_SYMBOL(ttm_bo_man_init);
>
> -static int ttm_bo_man_takedown(struct ttm_mem_type_manager *man)
> +static int ttm_bo_man_takedown_private(struct ttm_mem_type_manager *man)
> {
> struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
> struct drm_mm *mm = &rman->mm;
> @@ -146,6 +146,23 @@ static int ttm_bo_man_takedown(struct ttm_mem_type_manager *man)
> return -EBUSY;
> }
>
> +int ttm_bo_man_takedown(struct ttm_bo_device *bdev,
> + struct ttm_mem_type_manager *man)
Regarding naming I prefer init() and fini() as functions for object
initialization and destruction in C.
Christian.
> +{
> + int ret;
> +
> + ttm_bo_disable_mm(man);
> +
> + ret = ttm_bo_force_list_clean(bdev, man);
> + if (ret)
> + return ret;
> +
> + ttm_bo_man_takedown_private(man);
> + ttm_bo_man_cleanup(man);
> + return 0;
> +}
> +EXPORT_SYMBOL(ttm_bo_man_takedown);
> +
> static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
> struct drm_printer *printer)
> {
> @@ -157,7 +174,7 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
> }
>
> static const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
> - .takedown = ttm_bo_man_takedown,
> + .takedown = ttm_bo_man_takedown_private,
> .get_node = ttm_bo_man_get_node,
> .put_node = ttm_bo_man_put_node,
> .debug = ttm_bo_man_debug
> diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
> index 92bb54cce633..2ef33b407167 100644
> --- a/include/drm/ttm/ttm_bo_driver.h
> +++ b/include/drm/ttm/ttm_bo_driver.h
> @@ -683,6 +683,8 @@ static inline void ttm_bo_man_cleanup(struct ttm_mem_type_manager *man)
> man->move = NULL;
> }
>
> +int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
> + struct ttm_mem_type_manager *man);
> /*
> * ttm_bo_util.c
> */
> @@ -801,5 +803,6 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp);
> int ttm_bo_man_init(struct ttm_bo_device *bdev,
> struct ttm_mem_type_manager *man,
> unsigned long p_size);
> -
> +int ttm_bo_man_takedown(struct ttm_bo_device *bdev,
> + struct ttm_mem_type_manager *man);
> #endif
_______________________________________________
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:10 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 [this message]
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
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=163112c1-cc21-f37d-fd22-72a688fb1038@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).