From: "Christian König" <christian.koenig@amd.com>
To: Dave Airlie <airlied@gmail.com>, dri-devel@lists.freedesktop.org
Cc: sroland@vmware.com, linux-graphics-maintainer@vmware.com,
bskeggs@redhat.com, kraxel@redhat.com
Subject: Re: [PATCH 55/59] drm/ttm: drop type manager has_type
Date: Tue, 4 Aug 2020 13:37:59 +0200 [thread overview]
Message-ID: <602a5911-d208-a141-0d15-4b8a0dbd8a3c@amd.com> (raw)
In-Reply-To: <20200804025632.3868079-56-airlied@gmail.com>
Am 04.08.20 um 04:56 schrieb Dave Airlie:
> From: Dave Airlie <airlied@redhat.com>
>
> under driver control, this flag isn't needed anymore,
> remove the API that used to access it, and consoldiate
> with the used api.
>
> 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 | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +-
> drivers/gpu/drm/nouveau/nouveau_ttm.c | 4 ++--
> drivers/gpu/drm/ttm/ttm_bo.c | 8 +++-----
> drivers/gpu/drm/ttm/ttm_bo_manager.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 2 +-
> include/drm/ttm/ttm_bo_driver.h | 17 -----------------
> 8 files changed, 10 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> index 9fc3d876ed38..71461d652fcc 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> @@ -146,7 +146,7 @@ void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)
> struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
> int ret;
>
> - ttm_mem_type_manager_disable(man);
> + ttm_mem_type_manager_set_used(man, false);
>
> ret = ttm_mem_type_manager_force_list_clean(&adev->mman.bdev, man);
> if (ret)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> index 684698cdf772..8cc44c3d2fdd 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> @@ -223,7 +223,7 @@ void amdgpu_vram_mgr_fini(struct amdgpu_device *adev)
> struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
> int ret;
>
> - ttm_mem_type_manager_disable(man);
> + ttm_mem_type_manager_set_used(man, false);
>
> ret = ttm_mem_type_manager_force_list_clean(&adev->mman.bdev, man);
> if (ret)
> diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> index d408e1485cce..22185a8dcfa1 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> @@ -194,7 +194,7 @@ nouveau_ttm_fini_vram(struct nouveau_drm *drm)
> struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_VRAM);
>
> if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
> - ttm_mem_type_manager_disable(man);
> + ttm_mem_type_manager_set_used(man, false);
> ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
> ttm_mem_type_manager_cleanup(man);
> ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_VRAM, NULL);
> @@ -253,7 +253,7 @@ nouveau_ttm_fini_gtt(struct nouveau_drm *drm)
> drm->agp.bridge)
> ttm_range_man_fini(&drm->ttm.bdev, TTM_PL_TT);
> else {
> - ttm_mem_type_manager_disable(man);
> + ttm_mem_type_manager_set_used(man, false);
> ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
> ttm_mem_type_manager_cleanup(man);
> ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_TT, NULL);
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index 12abe46bfbc1..cda33b4af681 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -80,7 +80,6 @@ static inline int ttm_mem_type_from_place(const struct ttm_place *place,
> void ttm_mem_type_manager_debug(struct ttm_mem_type_manager *man,
> struct drm_printer *p)
> {
> - drm_printf(p, " has_type: %d\n", man->has_type);
> drm_printf(p, " use_type: %d\n", man->use_type);
> drm_printf(p, " use_tt: %d\n", man->use_tt);
> drm_printf(p, " size: %llu\n", man->size);
> @@ -1003,7 +1002,7 @@ static int ttm_bo_mem_placement(struct ttm_buffer_object *bo,
> return ret;
>
> man = ttm_manager_type(bdev, mem_type);
> - if (!man->has_type || !man->use_type)
> + if (!man || !man->use_type)
> return -EBUSY;
>
> if (!ttm_bo_mt_compatible(man, mem_type, place, &cur_flags))
> @@ -1462,7 +1461,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
> return -EINVAL;
> }
>
> - if (!man->has_type) {
> + if (!man) {
> pr_err("Memory type %u has not been initialized\n", mem_type);
> return 0;
> }
> @@ -1476,7 +1475,6 @@ void ttm_mem_type_manager_init(struct ttm_mem_type_manager *man,
> {
> unsigned i;
>
> - BUG_ON(man->has_type);
> man->use_io_reserve_lru = false;
> mutex_init(&man->io_reserve_mutex);
> spin_lock_init(&man->move_lock);
> @@ -1557,7 +1555,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
> struct ttm_mem_type_manager *man;
>
> man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
> - ttm_mem_type_manager_disable(man);
> + ttm_mem_type_manager_set_used(man, false);
> ttm_set_driver_manager(bdev, TTM_PL_SYSTEM, NULL);
>
> mutex_lock(&ttm_global_mutex);
> diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
> index 1b7245ce3356..6679dc11934f 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
> @@ -152,7 +152,7 @@ int ttm_range_man_fini(struct ttm_bo_device *bdev,
> struct drm_mm *mm = &rman->mm;
> int ret;
>
> - ttm_mem_type_manager_disable(man);
> + ttm_mem_type_manager_set_used(man, false);
>
> ret = ttm_mem_type_manager_force_list_clean(bdev, man);
> if (ret)
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
> index c3fa25161fd0..ca5037184814 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
> @@ -143,7 +143,7 @@ void vmw_gmrid_man_fini(struct vmw_private *dev_priv, int type)
> struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, type);
> struct vmwgfx_gmrid_man *gman = to_gmrid_manager(man);
>
> - ttm_mem_type_manager_disable(man);
> + ttm_mem_type_manager_set_used(man, false);
>
> ttm_mem_type_manager_force_list_clean(&dev_priv->bdev, man);
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
> index 0b9c29249393..4110e8309188 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
> @@ -152,7 +152,7 @@ void vmw_thp_fini(struct vmw_private *dev_priv)
> struct drm_mm *mm = &rman->mm;
> int ret;
>
> - ttm_mem_type_manager_disable(man);
> + ttm_mem_type_manager_set_used(man, false);
>
> ret = ttm_mem_type_manager_force_list_clean(&dev_priv->bdev, man);
> if (ret)
> diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
> index d5646d7cac60..300934289e64 100644
> --- a/include/drm/ttm/ttm_bo_driver.h
> +++ b/include/drm/ttm/ttm_bo_driver.h
> @@ -111,7 +111,6 @@ struct ttm_mem_type_manager_func {
> /**
> * struct ttm_mem_type_manager
> *
> - * @has_type: The memory type has been initialized.
> * @use_type: The memory type is enabled.
> * @flags: TTM_MEMTYPE_XX flags identifying the traits of the memory
> * managed by this memory type.
> @@ -141,8 +140,6 @@ struct ttm_mem_type_manager {
> /*
> * No protection. Constant from start.
> */
> -
> - bool has_type;
> bool use_type;
> bool use_tt;
> uint64_t size;
> @@ -678,23 +675,9 @@ static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo)
> */
> static inline void ttm_mem_type_manager_set_used(struct ttm_mem_type_manager *man, bool used)
> {
> - man->has_type = true;
> man->use_type = used;
> }
>
> -/**
> - * ttm_mem_type_manager_disable.
> - *
> - * @man: A memory manager object.
> - *
> - * Indicate the manager is not to be used and deregistered. (temporary during rework).
> - */
> -static inline void ttm_mem_type_manager_disable(struct ttm_mem_type_manager *man)
> -{
> - man->has_type = false;
> - man->use_type = false;
> -}
> -
> /**
> * ttm_mem_type_manager_cleanup
> *
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-08-04 11:38 UTC|newest]
Thread overview: 136+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-04 2:55 [00/59] ttm misc cleanups, mem refactoring, rename objects. (v2) Dave Airlie
2020-08-04 2:55 ` [PATCH 01/59] drm/vmwgfx: consolidate ttm object creation and populate Dave Airlie
2020-08-05 7:56 ` daniel
2020-08-04 2:55 ` [PATCH 02/59] drm/vmwgfx: drop bo map/unmap dma functions Dave Airlie
2020-08-05 7:59 ` daniel
2020-08-04 2:55 ` [PATCH 03/59] nouveau: use ttm populate mapping functions. (v2) Dave Airlie
2020-08-05 5:32 ` Ben Skeggs
2020-08-04 2:55 ` [PATCH 04/59] qxl/ttm: drop the unusued no wait flag to reserve function Dave Airlie
2020-08-04 10:46 ` Gerd Hoffmann
2020-08-04 2:55 ` [PATCH 05/59] drm/ttm/amdgpu: consolidate ttm reserve paths Dave Airlie
2020-08-04 10:33 ` Christian König
2020-08-04 2:55 ` [PATCH 06/59] drm/ttm: use a helper for unlocked moves to the lru tail Dave Airlie
2020-08-04 10:34 ` Christian König
2020-08-05 5:32 ` Ben Skeggs
2020-08-04 2:55 ` [PATCH 07/59] drm/vram-helper: remove populate/unpopulate Dave Airlie
2020-08-04 6:54 ` Thomas Zimmermann
2020-08-04 2:55 ` [PATCH 08/59] drm/ttm: export memory type debug entrypoint Dave Airlie
2020-08-04 10:35 ` Christian König
2020-08-05 5:34 ` Ben Skeggs
2020-08-04 2:55 ` [PATCH 09/59] drm/nouveau/ttm: don't fill in blank ttm debug callback Dave Airlie
2020-08-05 5:34 ` Ben Skeggs
2020-08-04 2:55 ` [PATCH 10/59] drm/vmwgfx/gmrid: don't provide pointless " Dave Airlie
2020-08-04 2:55 ` [PATCH 11/59] drm/qxl/ttm: call ttm manager debug (v2) Dave Airlie
2020-08-04 10:48 ` Gerd Hoffmann
2020-08-04 2:55 ` [PATCH 12/59] drm/vram-helper: call the ttm manager debug function Dave Airlie
2020-08-04 6:55 ` Thomas Zimmermann
2020-08-04 10:48 ` Gerd Hoffmann
2020-08-04 2:55 ` [PATCH 13/59] drm/ttm: split the mm manager init code (v2) Dave Airlie
2020-08-04 11:07 ` Christian König
2020-08-04 13:08 ` Christian König
2020-08-04 11:10 ` Christian König
2020-08-04 2:55 ` [PATCH 14/59] drm/ttm: provide a driver-led init path for range mm manager. (v2) Dave Airlie
2020-08-04 2:55 ` [PATCH 15/59] drm/amdgpu/ttm: init managers from the driver side Dave Airlie
2020-08-04 11:15 ` Christian König
2020-08-04 2:55 ` [PATCH 16/59] drm/radeon: use new ttm man init path Dave Airlie
2020-08-04 11:15 ` Christian König
2020-08-04 2:55 ` [PATCH 17/59] drm/qxl/ttm: use new init path for manager Dave Airlie
2020-08-04 10:49 ` Gerd Hoffmann
2020-08-04 2:55 ` [PATCH 18/59] drm/vram_helper: use new ttm manager init function Dave Airlie
2020-08-04 6:58 ` Thomas Zimmermann
2020-08-04 10:49 ` Gerd Hoffmann
2020-08-04 2:55 ` [PATCH 19/59] drm/nouveau: use new memory manager init paths Dave Airlie
2020-08-05 5:40 ` Ben Skeggs
2020-08-04 2:55 ` [PATCH 20/59] drm/vmwgfx/ttm: convert vram mm init to new code paths Dave Airlie
2020-08-05 8:57 ` daniel
2020-08-04 2:55 ` [PATCH 21/59] drm/vmwgfx/ttm: switch gmrid allocator to new init paths Dave Airlie
2020-08-05 9:00 ` daniel
2020-08-04 2:55 ` [PATCH 22/59] drm/ttm: convert system manager init to new code Dave Airlie
2020-08-05 5:40 ` Ben Skeggs
2020-08-04 2:55 ` [PATCH 23/59] drm/ttm: purge old manager init path Dave Airlie
2020-08-05 5:41 ` Ben Skeggs
2020-08-04 2:55 ` [PATCH 24/59] drm/ttm: pass man around instead of mem_type in some places Dave Airlie
2020-08-05 5:42 ` Ben Skeggs
2020-08-04 2:55 ` [PATCH 25/59] drm/ttm: make some inline helper functions for cleanup paths. (v2) Dave Airlie
2020-08-04 11:18 ` Christian König
2020-08-05 5:42 ` Ben Skeggs
2020-08-04 2:55 ` [PATCH 26/59] drm/ttm: start allowing drivers to use new takedown path (v2) Dave Airlie
2020-08-04 11:20 ` Christian König
2020-08-05 5:43 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 27/59] drm/amdgpu/ttm: use new takedown path Dave Airlie
2020-08-04 2:56 ` [PATCH 28/59] drm/vmwgfx: takedown vram manager Dave Airlie
2020-08-05 9:19 ` daniel
2020-08-04 2:56 ` [PATCH 29/59] drm/vram_helper: call explicit mm takedown Dave Airlie
2020-08-04 6:59 ` Thomas Zimmermann
2020-08-04 2:56 ` [PATCH 30/59] drm/nouveau: use new cleanup paths Dave Airlie
2020-08-05 5:44 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 31/59] drm/radeon/ttm: use new takedown paths Dave Airlie
2020-08-04 2:56 ` [PATCH 32/59] drm/qxl/ttm: use new takedown path Dave Airlie
2020-08-04 10:50 ` Gerd Hoffmann
2020-08-04 2:56 ` [PATCH 33/59] drm/vmwgfx: fix gmrid takedown paths to new interface Dave Airlie
2020-08-05 9:21 ` daniel
2020-08-04 2:56 ` [PATCH 34/59] drm/ttm: remove range manager legacy takedown path Dave Airlie
2020-08-05 5:45 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 35/59] drm/ttm: make TTM responsible for cleaning system only Dave Airlie
2020-08-05 5:46 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 36/59] drm/ttm: add wrapper to get manager from bdev Dave Airlie
2020-08-04 11:25 ` Christian König
2020-08-05 5:47 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 37/59] drm/amdgfx/ttm: use wrapper to get ttm memory managers Dave Airlie
2020-08-04 11:26 ` Christian König
2020-08-04 2:56 ` [PATCH 38/59] drm/vram-helper: use wrapper to access " Dave Airlie
2020-08-04 7:00 ` Thomas Zimmermann
2020-08-04 2:56 ` [PATCH 39/59] drm/nouveau/ttm: " Dave Airlie
2020-08-05 5:48 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 40/59] drm/qxl/ttm: use wrapper to access memory manager Dave Airlie
2020-08-04 10:50 ` Gerd Hoffmann
2020-08-04 2:56 ` [PATCH 41/59] drm/radeon/ttm: " Dave Airlie
2020-08-04 11:29 ` Christian König
2020-08-04 2:56 ` [PATCH 42/59] drm/vmwgfx/ttm: " Dave Airlie
2020-08-05 9:22 ` daniel
2020-08-04 2:56 ` [PATCH 43/59] drm/ttm: rename manager variable to make sure wrapper is used Dave Airlie
2020-08-04 11:29 ` Christian König
2020-08-05 5:49 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 44/59] drm/ttm: allow drivers to provide their own manager subclasses Dave Airlie
2020-08-04 11:30 ` Christian König
2020-08-05 5:49 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 45/59] drm/amdgpu/ttm: use bo manager subclassing for vram/gtt mgrs Dave Airlie
2020-08-04 11:32 ` Christian König
2020-08-04 2:56 ` [PATCH 46/59] drm/ttm: make ttm_range_man_init/takedown take type + args Dave Airlie
2020-08-04 11:35 ` Christian König
2020-08-05 5:51 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 47/59] drm/ttm: move range manager to subclassed driver allocation Dave Airlie
2020-08-05 5:52 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 48/59] drm/vmwgfx/ttm: move thp to driver managed Dave Airlie
2020-08-05 9:24 ` daniel
2020-08-04 2:56 ` [PATCH 49/59] drm/vmwgfx/gmrid: convert to driver controlled allocation Dave Airlie
2020-08-05 9:26 ` daniel
2020-08-04 2:56 ` [PATCH 50/59] drm/nouveau/ttm: move to driver allocated manager Dave Airlie
2020-08-05 5:53 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 51/59] drm/ttm: drop priv pointer in memory manager Dave Airlie
2020-08-05 5:54 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 52/59] drm/amdgpu/ttm: remove man->bdev references Dave Airlie
2020-08-04 2:56 ` [PATCH 53/59] drm/ttm: drop man->bdev link Dave Airlie
2020-08-05 5:54 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 54/59] drm/ttm: drop list of memory managers from device. (v2) Dave Airlie
2020-08-04 11:37 ` Christian König
2020-08-05 5:55 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 55/59] drm/ttm: drop type manager has_type Dave Airlie
2020-08-04 11:37 ` Christian König [this message]
2020-08-05 5:55 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 56/59] drm/ttm: add a wrapper for checking if manager is in use Dave Airlie
2020-08-04 11:38 ` Christian König
2020-08-05 5:56 ` Ben Skeggs
2020-08-05 9:04 ` daniel
2020-08-04 2:56 ` [PATCH 57/59] drm/ttm: rename bo manager to range manager Dave Airlie
2020-08-04 11:40 ` Christian König
2020-08-05 5:56 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 58/59] drm/ttm: rename ttm_mem_type_manager -> ttm_resource_manager Dave Airlie
2020-08-04 11:41 ` Christian König
2020-08-05 5:57 ` Ben Skeggs
2020-08-04 2:56 ` [PATCH 59/59] drm/ttm: rename ttm_mem_reg to ttm_resource Dave Airlie
2020-08-04 11:41 ` Christian König
2020-08-05 5:58 ` Ben Skeggs
2020-08-04 3:01 ` [00/59] ttm misc cleanups, mem refactoring, rename objects. (v2) Dave Airlie
2020-08-05 11:55 ` Christian König
2020-08-05 11:59 ` 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=602a5911-d208-a141-0d15-4b8a0dbd8a3c@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=linux-graphics-maintainer@vmware.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).